hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

V4L/DVB: saa7134: remove stray unlock_kernel 

An earlier commit removed the lock_kernel/unlock_kernel pair but forgot
to remove the unlock_kernel call in the cleanup path at the end of the
function.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil 2010-01-29 06:51:08 -03:00 committed by Mauro Carvalho Chehab
parent 92dcffb916
commit 7415c7602d
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/video/saa7134/saa7134-empress.c
View File

@ -93,9 +93,9 @@ static int ts_open(struct file *file)
dprintk("open dev=%s\n", video_device_node_name(vdev)); dprintk("open dev=%s\n", video_device_node_name(vdev));
err = -EBUSY; err = -EBUSY;
if (!mutex_trylock(&dev->empress_tsq.vb_lock)) if (!mutex_trylock(&dev->empress_tsq.vb_lock))
goto done; return err;
if (atomic_read(&dev->empress_users)) if (atomic_read(&dev->empress_users))
goto done_up; goto done;
/* Unmute audio */ /* Unmute audio */
saa_writeb(SAA7134_AUDIO_MUTE_CTRL, saa_writeb(SAA7134_AUDIO_MUTE_CTRL,
@ -105,10 +105,8 @@ static int ts_open(struct file *file)
file->private_data = dev; file->private_data = dev;
err = 0; err = 0;
done_up:
mutex_unlock(&dev->empress_tsq.vb_lock);
done: done:
unlock_kernel(); mutex_unlock(&dev->empress_tsq.vb_lock);
return err; return err;
} }