Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe78a49c authored by Devin Heitmueller's avatar Devin Heitmueller Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (11652): au0828: fix kernel oops regression on USB disconnect. 



A regression was introduced in hg changeset 33810c734a0d, which resulted in
a kernel panic whenever the device was disconnected from USB.  The call to
4l2_device_register() was overwriting the pointer for usb_set_intfdata(), so
when au0828_usb_disconnect() was called, the usb_get_intfdata() returned a
pointer to the v4l2_device instead of the au0828_dev structure.

Signed-off-by: default avatarDevin Heitmueller <dheitmueller@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d4dc673d

drivers/media/video/au0828/au0828-core.c

+4 −2
Original line number Diff line number Diff line
@@ -192,8 +192,6 @@ static int au0828_usb_probe(struct usb_interface *interface, 
	dev->usbdev = usbdev;

	dev->boardnr = id->driver_info;



	usb_set_intfdata(interface, dev);



	/* Create the v4l2_device */

	retval = v4l2_device_register(&interface->dev, &dev->v4l2_dev);

	if (retval) {
@@ -222,6 +220,10 @@ static int au0828_usb_probe(struct usb_interface *interface, 
	/* Digital TV */

	au0828_dvb_register(dev);



	/* Store the pointer to the au0828_dev so it can be accessed in

	   au0828_usb_disconnect */

	usb_set_intfdata(interface, dev);



	printk(KERN_INFO "Registered device AU0828 [%s]\n",

		dev->board.name == NULL ? "Unset" : dev->board.name);