diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-04 03:08:36 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-04 03:08:36 +0300 |
| commit | c031d52cac3fa4b05cf59cd03e9328790f4d4496 (patch) | |
| tree | 2eb148d3be46779ea30d221c10c3e67b4e31d9ed | |
| parent | c1c0cbb8781e4b684a3d902d05b01912b3a545d9 (diff) | |
| parent | ba9e9f3c08a5b58c1ffacf0cc6fb703ab0fa55ff (diff) | |
| download | linux-c031d52cac3fa4b05cf59cd03e9328790f4d4496.tar.xz | |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
saa7146: stop DMA before de-allocating DMA scatter/gather page buffers
V4L/DVB: saa7134: remove stray unlock_kernel
| -rw-r--r-- | drivers/media/common/saa7146_video.c | 4 | ||||
| -rw-r--r-- | drivers/media/video/saa7134/saa7134-empress.c | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c index becbaadb3b77..5ed75263340a 100644 --- a/drivers/media/common/saa7146_video.c +++ b/drivers/media/common/saa7146_video.c @@ -1333,9 +1333,9 @@ static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb) DEB_CAP(("vbuf:%p\n",vb)); - release_all_pagetables(dev, buf); - saa7146_dma_free(dev,q,buf); + + release_all_pagetables(dev, buf); } static struct videobuf_queue_ops video_qops = { 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; } |