[media] usbvision: convert to unlocked_ioctl

[mv-sheeva.git] / drivers / media / video / usbvision / usbvision-core.c

diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c
index b9dd74fde212cc6d040fabe44f324da64863557b..de58aa7d9e1d5bf44da01d475bf1f4816c08ac3c 100644 (file)
--- 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)