summaryrefslogtreecommitdiff
path: root/drivers/media/video
diff options
context:
space:
mode:
authorThierry MERLE <thierry.merle@free.fr>2006-12-10 19:31:04 +0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-12-10 19:52:18 +0300
commit1de1bf06330920802d3b7646a088965bdd918356 (patch)
tree9b129e079739fb867b6c248c0d33d0a742d91eaf /drivers/media/video
parent67952e8cb111c5b2f9e675dba1bbde4876f9fcf3 (diff)
downloadlinux-1de1bf06330920802d3b7646a088965bdd918356.tar.xz
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>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/usbvision/usbvision-core.c2
-rw-r--r--drivers/media/video/usbvision/usbvision.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c
index 9ff93e7346ae..797b97baf9ed 100644
--- 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 782abf4ffaab..0e7e3d653cac 100644
--- 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;