V4L/DVB (6400): usbvision: Convert the usbvision->lock semaphore to the mutex API

[firefly-linux-kernel-4.4.55.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 c7d5f9ed22d7add7a5997caad00cb050377204d0..2038d409f1dc66702c202f3b8baafe737352c204 100644 (file)
--- a/drivers/media/video/usbvision/usbvision-core.c
+++ b/drivers/media/video/usbvision/usbvision-core.c
@@ -2242,14 +2242,18 @@ static void call_usbvision_power_off(struct work_struct *work)
        struct usb_usbvision *usbvision = container_of(work, struct usb_usbvision, powerOffWork);
 
        PDEBUG(DBG_FUNC, "");
-       down_interruptible(&usbvision->lock);
+       if(mutex_lock_interruptible(&usbvision->lock)) {
+               return;
+       }
+
+
        if(usbvision->user == 0) {
                usbvision_i2c_unregister(usbvision);
 
                usbvision_power_off(usbvision);
                usbvision->initialized = 0;
        }
-       up(&usbvision->lock);
+       mutex_unlock(&usbvision->lock);
 }
 
 static void usbvision_powerOffTimer(unsigned long data)