leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] dvb_usb_v2: ensure driver_info is not null

Browse Source 
It could be null in case of driver does not set it
properly, like missing dynamic ID handling.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Antti Palosaari 2012-06-05 20:37:46 -03:00 committed by Mauro Carvalho Chehab
parent e48b2a6861
commit 0a8673569f
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/media/dvb/dvb-usb/dvb_usb_init.c
View File

@ -258,10 +258,18 @@ int dvb_usbv2_device_init_(struct usb_interface *intf,
struct dvb_usb_device *d = NULL;
struct dvb_usb_driver_info *driver_info =
(struct dvb_usb_driver_info *) id->driver_info;
const struct dvb_usb_device_properties *props = driver_info->props;
const struct dvb_usb_device_properties *props;
int ret = -ENOMEM;
bool cold = false;
if (!id->driver_info) {
pr_err("%s: driver_info is null", KBUILD_MODNAME);
ret = -ENODEV;
goto err;
}
props = driver_info->props;
d = kzalloc(sizeof(struct dvb_usb_device), GFP_KERNEL);
if (d == NULL) {
err("no memory for 'struct dvb_usb_device'");
@ -326,7 +334,8 @@ int dvb_usbv2_device_init_(struct usb_interface *intf,
err_kfree:
kfree(d->priv);
kfree(d);
err:
pr_debug("%s: failed=%d\n", __func__, ret);
return ret;
}