diff options
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 b9dd74fde212..de58aa7d9e1d 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) | |||
2291 | struct usb_usbvision *usbvision = container_of(work, struct usb_usbvision, powerOffWork); | 2291 | struct usb_usbvision *usbvision = container_of(work, struct usb_usbvision, powerOffWork); |
2292 | 2292 | ||
2293 | PDEBUG(DBG_FUNC, ""); | 2293 | PDEBUG(DBG_FUNC, ""); |
2294 | if(mutex_lock_interruptible(&usbvision->lock)) { | 2294 | if (mutex_lock_interruptible(&usbvision->v4l2_lock)) |
2295 | return; | 2295 | return; |
2296 | } | ||
2297 | |||
2298 | 2296 | ||
2299 | if(usbvision->user == 0) { | 2297 | if(usbvision->user == 0) { |
2300 | usbvision_i2c_unregister(usbvision); | 2298 | usbvision_i2c_unregister(usbvision); |
@@ -2302,7 +2300,7 @@ static void call_usbvision_power_off(struct work_struct *work) | |||
2302 | usbvision_power_off(usbvision); | 2300 | usbvision_power_off(usbvision); |
2303 | usbvision->initialized = 0; | 2301 | usbvision->initialized = 0; |
2304 | } | 2302 | } |
2305 | mutex_unlock(&usbvision->lock); | 2303 | mutex_unlock(&usbvision->v4l2_lock); |
2306 | } | 2304 | } |
2307 | 2305 | ||
2308 | static void usbvision_powerOffTimer(unsigned long data) | 2306 | static void usbvision_powerOffTimer(unsigned long data) |