diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-01-29 04:51:08 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-01-29 15:34:06 -0500 |
| commit | 7415c7602ddb14a9a9c39bc8c38afa667092a527 (patch) | |
| tree | b837c85e88d1979fd9fe9afcd9aa0c7e8625b88a | |
| parent | 92dcffb916d309aa01778bf8963a6932e4014d07 (diff) | |
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>
| -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) | |||
| 93 | dprintk("open dev=%s\n", video_device_node_name(vdev)); | 93 | dprintk("open dev=%s\n", video_device_node_name(vdev)); |
| 94 | err = -EBUSY; | 94 | err = -EBUSY; |
| 95 | if (!mutex_trylock(&dev->empress_tsq.vb_lock)) | 95 | if (!mutex_trylock(&dev->empress_tsq.vb_lock)) |
| 96 | goto done; | 96 | return err; |
| 97 | if (atomic_read(&dev->empress_users)) | 97 | if (atomic_read(&dev->empress_users)) |
| 98 | goto done_up; | 98 | goto done; |
| 99 | 99 | ||
| 100 | /* Unmute audio */ | 100 | /* Unmute audio */ |
| 101 | saa_writeb(SAA7134_AUDIO_MUTE_CTRL, | 101 | saa_writeb(SAA7134_AUDIO_MUTE_CTRL, |
| @@ -105,10 +105,8 @@ static int ts_open(struct file *file) | |||
| 105 | file->private_data = dev; | 105 | file->private_data = dev; |
| 106 | err = 0; | 106 | err = 0; |
| 107 | 107 | ||
| 108 | done_up: | ||
| 109 | mutex_unlock(&dev->empress_tsq.vb_lock); | ||
| 110 | done: | 108 | done: |
| 111 | unlock_kernel(); | 109 | mutex_unlock(&dev->empress_tsq.vb_lock); |
| 112 | return err; | 110 | return err; |
| 113 | } | 111 | } |
| 114 | 112 | ||
