From c627b9d1f580f26fe99a8045d37a57f91e9aef66 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sat, 18 Dec 2010 11:06:09 -0300 Subject: [media] usbvision: convert to unlocked_ioctl Convert driver to use core-assisted locking. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- drivers/media/video/usbvision/usbvision.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/media/video/usbvision/usbvision.h') diff --git a/drivers/media/video/usbvision/usbvision.h b/drivers/media/video/usbvision/usbvision.h index cc4e96c8cd6c..2271ede78ddf 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? */ -- cgit v1.2.2