[media] cx231xx: don't use dev it not allocated
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>
Mon, 2 Feb 2015 12:52:26 +0000 (10:52 -0200)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Mon, 2 Feb 2015 12:56:55 +0000 (10:56 -0200)
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>
drivers/media/usb/cx231xx/cx231xx-cards.c

index 33c2fa2..da03733 100644 (file)
@@ -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;
 }