summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/usbvision/usbvision.h
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-12-18 11:06:09 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-30 08:01:45 -0200
commitc627b9d1f580f26fe99a8045d37a57f91e9aef66 (patch)
tree3699c7f3fbcc44bfaae1d6bd09cb814a69adb404 /drivers/media/video/usbvision/usbvision.h
parent427aacfe1d0c540bf80e5243d18ba1272f9b756f (diff)
[media] usbvision: convert to unlocked_ioctl
Convert driver to use core-assisted locking. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/usbvision/usbvision.h')
-rw-r--r--drivers/media/video/usbvision/usbvision.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/usbvision/usbvision.h b/drivers/media/video/usbvision/usbvision.h
index cc4e96c8cd6..2271ede78dd 100644
--- a/drivers/media/video/usbvision/usbvision.h
+++ b/drivers/media/video/usbvision/usbvision.h
@@ -391,7 +391,7 @@ struct usb_usbvision {
unsigned char iface; /* Video interface number */
unsigned char ifaceAlt; /* Alt settings */
unsigned char Vin_Reg2_Preset;
- struct mutex lock;
+ struct mutex v4l2_lock;
struct timer_list powerOffTimer;
struct work_struct powerOffWork;
int power; /* is the device powered on? */