From: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Date: Mon, 2 Feb 2015 12:52:26 +0000 (-0200)
Subject: [media] cx231xx: don't use dev it not allocated
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b5603a943d11cd4c74e90fdd68296ffdc8f6749c;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

[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>
---

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;
 }