mirror of
https://github.com/torvalds/linux.git
synced 2024-12-11 05:33:09 +00:00
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:
parent
92dcffb916
commit
7415c7602d
@ -93,9 +93,9 @@ static int ts_open(struct file *file)
|
||||
dprintk("open dev=%s\n", video_device_node_name(vdev));
|
||||
err = -EBUSY;
|
||||
if (!mutex_trylock(&dev->empress_tsq.vb_lock))
|
||||
goto done;
|
||||
return err;
|
||||
if (atomic_read(&dev->empress_users))
|
||||
goto done_up;
|
||||
goto done;
|
||||
|
||||
/* Unmute audio */
|
||||
saa_writeb(SAA7134_AUDIO_MUTE_CTRL,
|
||||
@ -105,10 +105,8 @@ static int ts_open(struct file *file)
|
||||
file->private_data = dev;
|
||||
err = 0;
|
||||
|
||||
done_up:
|
||||
mutex_unlock(&dev->empress_tsq.vb_lock);
|
||||
done:
|
||||
unlock_kernel();
|
||||
mutex_unlock(&dev->empress_tsq.vb_lock);
|
||||
return err;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user