diff options
author | Thierry MERLE <thierry.merle@free.fr> | 2006-12-10 11:31:04 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-10 11:52:18 -0500 |
commit | 1de1bf06330920802d3b7646a088965bdd918356 (patch) | |
tree | 9b129e079739fb867b6c248c0d33d0a742d91eaf /drivers/media | |
parent | 67952e8cb111c5b2f9e675dba1bbde4876f9fcf3 (diff) |
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')
-rw-r--r-- | drivers/media/video/usbvision/usbvision-core.c | 2 | ||||
-rw-r--r-- | drivers/media/video/usbvision/usbvision.h | 2 |
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) | |||
2218 | // to call usbvision_power_off from task queue | 2218 | // to call usbvision_power_off from task queue |
2219 | static void call_usbvision_power_off(struct work_struct *work) | 2219 | static void call_usbvision_power_off(struct work_struct *work) |
2220 | { | 2220 | { |
2221 | struct usb_usbvision *usbvision = container_of(work, struct usb_usbvision, work); | 2221 | struct usb_usbvision *usbvision = container_of(work, struct usb_usbvision, powerOffWork); |
2222 | 2222 | ||
2223 | PDEBUG(DBG_FUNC, ""); | 2223 | PDEBUG(DBG_FUNC, ""); |
2224 | down_interruptible(&usbvision->lock); | 2224 | 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 { | |||
381 | struct video_device *rdev; /* Radio Device */ | 381 | struct video_device *rdev; /* Radio Device */ |
382 | struct video_device *vbi; /* VBI Device */ | 382 | struct video_device *vbi; /* VBI Device */ |
383 | 383 | ||
384 | struct work_struct work; | ||
385 | |||
386 | /* i2c Declaration Section*/ | 384 | /* i2c Declaration Section*/ |
387 | struct i2c_adapter i2c_adap; | 385 | struct i2c_adapter i2c_adap; |
388 | struct i2c_algo_usb_data i2c_algo; | 386 | struct i2c_algo_usb_data i2c_algo; |