diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-11 10:05:30 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-11 10:05:30 -0300 |
| commit | e9ce526e2d6a86e18043040a37fbeb33b6aa7f78 (patch) | |
| tree | 0efeac6454b5eaeb7c361c33ce6e5546b4d29651 /linux/drivers/media/video/pxa_camera.c | |
| parent | d3f91b69f01b8f1c132d1037137ef9b6fba4a142 (diff) | |
| parent | 431b7b75e8f6cc9c89cfca9f7e307731c3b07d0d (diff) | |
| download | mediapointer-dvb-s2-e9ce526e2d6a86e18043040a37fbeb33b6aa7f78.tar.gz mediapointer-dvb-s2-e9ce526e2d6a86e18043040a37fbeb33b6aa7f78.tar.bz2 | |
merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/pxa_camera.c')
| -rw-r--r-- | linux/drivers/media/video/pxa_camera.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/linux/drivers/media/video/pxa_camera.c b/linux/drivers/media/video/pxa_camera.c index 3f1b63e4e..92fb8b191 100644 --- a/linux/drivers/media/video/pxa_camera.c +++ b/linux/drivers/media/video/pxa_camera.c @@ -624,6 +624,7 @@ static void pxa_camera_stop_capture(struct pxa_camera_dev *pcdev) dev_dbg(pcdev->soc_host.dev, "%s\n", __func__); } +/* Called under spinlock_irqsave(&pcdev->lock, ...) */ static void pxa_videobuf_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb) { @@ -631,13 +632,10 @@ static void pxa_videobuf_queue(struct videobuf_queue *vq, struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent); struct pxa_camera_dev *pcdev = ici->priv; struct pxa_buffer *buf = container_of(vb, struct pxa_buffer, vb); - unsigned long flags; dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %d active=%p\n", __func__, vb, vb->baddr, vb->bsize, pcdev->active); - spin_lock_irqsave(&pcdev->lock, flags); - list_add_tail(&vb->queue, &pcdev->capture); vb->state = VIDEOBUF_ACTIVE; @@ -645,8 +643,6 @@ static void pxa_videobuf_queue(struct videobuf_queue *vq, if (!pcdev->active) pxa_camera_start_capture(pcdev); - - spin_unlock_irqrestore(&pcdev->lock, flags); } static void pxa_videobuf_release(struct videobuf_queue *vq, |