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>
git-mirror · Dec 10, 2006 · 1de1bf0 · 1de1bf0
1 parent 67952e8
commit 1de1bf0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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;