media: cx88: add error handling for snd_ctl_add
authorZhouyang Jia <jiazhouyang09@gmail.com>
Mon, 11 Jun 2018 07:41:58 +0000 (03:41 -0400)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Thu, 28 Jun 2018 11:54:27 +0000 (07:54 -0400)
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 <jiazhouyang09@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/pci/cx88/cx88-alsa.c

index e5c3387..89a6547 100644 (file)
@@ -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);