V4L/DVB 4949b: Fix container_of pointer retreival

Signed-off-by: Thierry MERLE <thierry.merle@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c
index 9ff93e7346ae8aab824ed10896e2669a2d47ceed..797b97baf9ed1575d79cbf33e17827bb5a105f5b 100644 (file)
--- a/drivers/media/video/usbvision/usbvision-core.c
+++ b/drivers/media/video/usbvision/usbvision-core.c
@@ -2218,7 +2218,7 @@ int usbvision_power_on(struct usb_usbvision *usbvision)
 // to call usbvision_power_off from task queue
 static void call_usbvision_power_off(struct work_struct *work)
 {
-       struct usb_usbvision *usbvision = container_of(work, struct usb_usbvision, work);
+       struct usb_usbvision *usbvision = container_of(work, struct usb_usbvision, powerOffWork);
 
        PDEBUG(DBG_FUNC, "");
        down_interruptible(&usbvision->lock);

diff --git a/drivers/media/video/usbvision/usbvision.h b/drivers/media/video/usbvision/usbvision.h
index 782abf4ffaab9b157e2252d77df910515b88994f..0e7e3d653cacd30c0bdf41dc8ef01390f36b2477 100644 (file)
--- a/drivers/media/video/usbvision/usbvision.h
+++ b/drivers/media/video/usbvision/usbvision.h
@@ -381,8 +381,6 @@ struct usb_usbvision {
        struct video_device *rdev;                                      /* Radio Device */
        struct video_device *vbi;                                       /* VBI Device   */
 
-       struct work_struct work;
-
        /* i2c Declaration Section*/
        struct i2c_adapter i2c_adap;
        struct i2c_algo_usb_data i2c_algo;