diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-02-02 13:52:26 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-02-02 13:56:55 +0100 |
| commit | b5603a943d11cd4c74e90fdd68296ffdc8f6749c (patch) | |
| tree | 42fe2f2a74cb2623a2f80fb5aad083ee662b2674 /drivers/media/usb/cx231xx | |
| parent | [media] cx231xx: fix usbdev leak on failure paths in cx231xx_usb_probe() (diff) | |
| download | linux-b5603a943d11cd4c74e90fdd68296ffdc8f6749c.tar.xz linux-b5603a943d11cd4c74e90fdd68296ffdc8f6749c.zip | |
[media] cx231xx: don't use dev it not allocated
changeset 5eeb3014827f added a fixup at the error check
code. However, it introduced a new error:
drivers/media/usb/cx231xx/cx231xx-cards.c:1586 cx231xx_usb_probe() error: we previously assumed 'dev' could be null (see line 1430)
This happens when dev = kmalloc() fails. So, instead of relying
on it to succeed, just change the parameter of clear_bit() from
'dev->devno' to 'nr'.
Cc: Alexey Khoroshilov <khoroshilov@ispras.ru>
Cc: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/usb/cx231xx')
| -rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-cards.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c index 33c2fa2e7596..da03733690bd 100644 --- a/drivers/media/usb/cx231xx/cx231xx-cards.c +++ b/drivers/media/usb/cx231xx/cx231xx-cards.c @@ -1583,7 +1583,7 @@ err_v4l2: usb_set_intfdata(interface, NULL); err_if: usb_put_dev(udev); - clear_bit(dev->devno, &cx231xx_devused); + clear_bit(nr, &cx231xx_devused); return retval; } |