diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-12-18 11:06:09 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-30 08:01:45 -0200 |
| commit | c627b9d1f580f26fe99a8045d37a57f91e9aef66 (patch) | |
| tree | 3699c7f3fbcc44bfaae1d6bd09cb814a69adb404 /drivers/media/video/usbvision/usbvision-core.c | |
| parent | 427aacfe1d0c540bf80e5243d18ba1272f9b756f (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-core.c')
| -rw-r--r-- | drivers/media/video/usbvision/usbvision-core.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c index b9dd74fde21..de58aa7d9e1 100644 --- a/drivers/media/video/usbvision/usbvision-core.c +++ b/drivers/media/video/usbvision/usbvision-core.c @@ -2291,10 +2291,8 @@ static void call_usbvision_power_off(struct work_struct *work) struct usb_usbvision *usbvision = container_of(work, struct usb_usbvision, powerOffWork); PDEBUG(DBG_FUNC, ""); - if(mutex_lock_interruptible(&usbvision->lock)) { + if (mutex_lock_interruptible(&usbvision->v4l2_lock)) return; - } - if(usbvision->user == 0) { usbvision_i2c_unregister(usbvision); @@ -2302,7 +2300,7 @@ static void call_usbvision_power_off(struct work_struct *work) usbvision_power_off(usbvision); usbvision->initialized = 0; } - mutex_unlock(&usbvision->lock); + mutex_unlock(&usbvision->v4l2_lock); } static void usbvision_powerOffTimer(unsigned long data) |