diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-01-29 06:51:08 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-01-29 18:34:06 -0200 |
| commit | 7415c7602ddb14a9a9c39bc8c38afa667092a527 (patch) | |
| tree | b837c85e88d1979fd9fe9afcd9aa0c7e8625b88a /drivers/media/video/saa7134/saa7134-empress.c | |
| parent | 92dcffb916d309aa01778bf8963a6932e4014d07 (diff) | |
| download | linux-7415c7602ddb14a9a9c39bc8c38afa667092a527.tar.gz linux-7415c7602ddb14a9a9c39bc8c38afa667092a527.tar.bz2 linux-7415c7602ddb14a9a9c39bc8c38afa667092a527.zip | |
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>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-empress.c')
| -rw-r--r-- | drivers/media/video/saa7134/saa7134-empress.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c index 7dfecfc6017c..ee5bff02a92c 100644 --- a/drivers/media/video/saa7134/saa7134-empress.c +++ b/drivers/media/video/saa7134/saa7134-empress.c @@ -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; } |