---

yaml --- r: 44152 b: refs/heads/master c: 1de1bf0 h: refs/heads/master v: v3
git-mirror · Dec 10, 2006 · 5642bfa · 5642bfa
1 parent d6b5a14
commit 5642bfa
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67952e8cb111c5b2f9e675dba1bbde4876f9fcf3
+refs/heads/master: 1de1bf06330920802d3b7646a088965bdd918356
diff --git a/trunk/drivers/media/video/usbvision/usbvision-core.c b/trunk/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/trunk/drivers/media/video/usbvision/usbvision.h b/trunk/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;