When snd_ctl_add fails, the lack of error-handling code may
cause unexpected results.

This patch adds error-handling code after calling snd_ctl_add.

Signed-off-by: Zhouyang Jia <jiazhouyan...@gmail.com>
---
 drivers/media/pci/cx88/cx88-alsa.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/media/pci/cx88/cx88-alsa.c 
b/drivers/media/pci/cx88/cx88-alsa.c
index 8a28fda..d366793 100644
--- a/drivers/media/pci/cx88/cx88-alsa.c
+++ b/drivers/media/pci/cx88/cx88-alsa.c
@@ -962,8 +962,11 @@ static int cx88_audio_initdev(struct pci_dev *pci,
                goto error;
 
        /* If there's a wm8775 then add a Line-In ALC switch */
-       if (core->sd_wm8775)
-               snd_ctl_add(card, snd_ctl_new1(&snd_cx88_alc_switch, chip));
+       if (core->sd_wm8775) {
+               err = snd_ctl_add(card, snd_ctl_new1(&snd_cx88_alc_switch, 
chip));
+               if (err < 0)
+                       goto error;
+       }
 
        strcpy(card->driver, "CX88x");
        sprintf(card->shortname, "Conexant CX%x", pci->device);
-- 
2.7.4

Reply via email to