diff options
| author | Zhouyang Jia <jiazhouyang09@gmail.com> | 2018-06-11 03:41:58 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2018-06-28 07:54:27 -0400 |
| commit | 6c8871baebc781f27ec9ccc1324afd9802941b11 (patch) | |
| tree | 30ceb9c9b599ebd302f02627f2c03a430f602e95 /drivers/media/pci/cx88 | |
| parent | 7534122d60066a50859c422ced4636deb23760bf (diff) | |
| download | linux-6c8871baebc781f27ec9ccc1324afd9802941b11.tar.gz linux-6c8871baebc781f27ec9ccc1324afd9802941b11.tar.bz2 linux-6c8871baebc781f27ec9ccc1324afd9802941b11.zip | |
media: cx88: add error handling for snd_ctl_add
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>
Diffstat (limited to 'drivers/media/pci/cx88')
| -rw-r--r-- | drivers/media/pci/cx88/cx88-alsa.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/media/pci/cx88/cx88-alsa.c b/drivers/media/pci/cx88/cx88-alsa.c index e5c3387cd1e8..89a65478ae36 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); |