From 6d67fdc302e1b986dcbd6729167116a4463f1f03 Mon Sep 17 00:00:00 2001 From: Thierry MERLE Date: Wed, 24 Oct 2007 22:31:15 +0200 Subject: usbvision: Convert the usbvision->lock semaphore to the mutex API From: Matthias Kaehlcke Convert the usbvision->lock semaphore to the mutex API Signed-off-by: Matthias Kaehlcke Reviewed-by: Thierry MERLE --- linux/drivers/media/video/usbvision/usbvision-core.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'linux/drivers/media/video/usbvision/usbvision-core.c') diff --git a/linux/drivers/media/video/usbvision/usbvision-core.c b/linux/drivers/media/video/usbvision/usbvision-core.c index f83e9bfed..996203969 100644 --- a/linux/drivers/media/video/usbvision/usbvision-core.c +++ b/linux/drivers/media/video/usbvision/usbvision-core.c @@ -2312,14 +2312,18 @@ static void call_usbvision_power_off(struct work_struct *work) #endif 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) -- cgit v1.2.3