Skip to content

Commit

Permalink
V4L/DVB: saa7134: remove stray unlock_kernel
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Hans Verkuil authored and Mauro Carvalho Chehab committed Jan 29, 2010
1 parent 92dcffb commit 7415c76
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions drivers/media/video/saa7134/saa7134-empress.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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;
}

Expand Down

0 comments on commit 7415c76

Please sign in to comment.