Commit 7415c760 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

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: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 92dcffb9
...@@ -93,9 +93,9 @@ static int ts_open(struct file *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) ...@@ -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;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment