diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-11 13:56:40 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-11 13:56:40 -0300 |
| commit | 6971a9d650f6ab06dfedc4464665366c87da4bbc (patch) | |
| tree | 6274d376e8d2ee13a4fecb2d0f9e294bc35935ef /linux/drivers/media/video/sh_mobile_ceu_camera.c | |
| parent | 6355bbe94603dee693331f5ae62c8c1a109a8007 (diff) | |
| parent | 796c449e9807bc070a33bcbbab2f4cae6cfc6d14 (diff) | |
| download | mediapointer-dvb-s2-6971a9d650f6ab06dfedc4464665366c87da4bbc.tar.gz mediapointer-dvb-s2-6971a9d650f6ab06dfedc4464665366c87da4bbc.tar.bz2 | |
merge: http://www.kernellabs.com/hg/~dheitmueller/ttxs-remote/
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/sh_mobile_ceu_camera.c')
| -rw-r--r-- | linux/drivers/media/video/sh_mobile_ceu_camera.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/linux/drivers/media/video/sh_mobile_ceu_camera.c b/linux/drivers/media/video/sh_mobile_ceu_camera.c index 7ea2a0edf..1bae28a98 100644 --- a/linux/drivers/media/video/sh_mobile_ceu_camera.c +++ b/linux/drivers/media/video/sh_mobile_ceu_camera.c @@ -283,27 +283,24 @@ out: return ret; } +/* Called under spinlock_irqsave(&pcdev->lock, ...) */ static void sh_mobile_ceu_videobuf_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb) { struct soc_camera_device *icd = vq->priv_data; struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent); struct sh_mobile_ceu_dev *pcdev = ici->priv; - unsigned long flags; dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %zd\n", __func__, vb, vb->baddr, vb->bsize); vb->state = VIDEOBUF_QUEUED; - spin_lock_irqsave(&pcdev->lock, flags); list_add_tail(&vb->queue, &pcdev->capture); if (!pcdev->active) { pcdev->active = vb; sh_mobile_ceu_capture(pcdev); } - - spin_unlock_irqrestore(&pcdev->lock, flags); } static void sh_mobile_ceu_videobuf_release(struct videobuf_queue *vq, |