UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

V4L/DVB: cx18: address possible passing of NULL to snd_card_free 

Eliminate the possibility of passing NULL to snd_card_free().

Thanks to Takashi Iwai for reviewing and pointing this out.

This work was sponsored by ONELAN Limited.

Cc: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Devin Heitmueller 2010-01-07 00:52:39 -03:00 committed by Mauro Carvalho Chehab
parent 60433e2ab8
commit c71fd169a1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/video/cx18/cx18-alsa-main.c
View File

@ -134,7 +134,7 @@ static int __init snd_cx18_card_set_names(struct snd_cx18_card *cxsc)
static int __init snd_cx18_init(struct v4l2_device *v4l2_dev) static int __init snd_cx18_init(struct v4l2_device *v4l2_dev)
{ {
struct cx18 *cx = to_cx18(v4l2_dev); struct cx18 *cx = to_cx18(v4l2_dev);
struct snd_card *sc; struct snd_card *sc = NULL;
struct snd_cx18_card *cxsc; struct snd_cx18_card *cxsc;
int ret; int ret;
@ -189,7 +189,8 @@ static int __init snd_cx18_init(struct v4l2_device *v4l2_dev)
return 0; return 0;
err_exit_free: err_exit_free:
snd_card_free(sc); if (sc != NULL)
snd_card_free(sc);
err_exit: err_exit:
return ret; return ret;
} }