diff options
| author | Matthias Kaehlcke <matthias.kaehlcke@gmail.com> | 2007-10-24 17:31:15 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-25 19:00:55 -0200 |
| commit | 289d4d2f0746715ada41e0945116eb3d62d5f35c (patch) | |
| tree | dfb7dc29cd73101db3c3dc83a6835a1b2748955c /drivers/media/video/usbvision/usbvision-core.c | |
| parent | b02044d81fc028d4fef1c65f9b179a0aec091f0b (diff) | |
| download | kernel_goldelico_gta04-289d4d2f0746715ada41e0945116eb3d62d5f35c.zip kernel_goldelico_gta04-289d4d2f0746715ada41e0945116eb3d62d5f35c.tar.gz kernel_goldelico_gta04-289d4d2f0746715ada41e0945116eb3d62d5f35c.tar.bz2 | |
V4L/DVB (6400): usbvision: Convert the usbvision->lock semaphore to the mutex API
Convert the usbvision->lock semaphore to the mutex API
Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com>
Reviewed-by: Thierry MERLE <thierry.merle@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/usbvision/usbvision-core.c')
| -rw-r--r-- | drivers/media/video/usbvision/usbvision-core.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c index c7d5f9e..2038d40 100644 --- 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) |