diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-09-26 08:01:26 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-20 23:06:14 -0400 |
commit | 0e0809a58869e3e422985f868ad5e0da1fc0ba85 (patch) | |
tree | e4895d60a050e15d6c4b21aa7dbc4090199efdf3 /drivers/media/video/mx3_camera.c | |
parent | 08bff03ed697a583612b62a6ac566bd5bce98012 (diff) |
V4L/DVB: videobuf: add queue argument to videobuf_waiton()
videobuf_waiton() must unlock and relock ext_lock if it has to wait.
For that to happen it needs the videobuf_queue pointer.
Don't attempt to unlock/relock q->ext_lock unless it was locked in the
first place.
vb->state has to be protected by a spinlock to be safe.
This patch is based on code from Mauro Carvalho Chehab <mchehab@redhat.com>.
[mchehab@redhat.com: add extra argument to a few missing places]
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/mx3_camera.c')
-rw-r--r-- | drivers/media/video/mx3_camera.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/video/mx3_camera.c index a9be14c23912..a13076969e5a 100644 --- a/drivers/media/video/mx3_camera.c +++ b/drivers/media/video/mx3_camera.c | |||
@@ -185,7 +185,7 @@ static void free_buffer(struct videobuf_queue *vq, struct mx3_camera_buffer *buf | |||
185 | * This waits until this buffer is out of danger, i.e., until it is no | 185 | * This waits until this buffer is out of danger, i.e., until it is no |
186 | * longer in STATE_QUEUED or STATE_ACTIVE | 186 | * longer in STATE_QUEUED or STATE_ACTIVE |
187 | */ | 187 | */ |
188 | videobuf_waiton(vb, 0, 0); | 188 | videobuf_waiton(vq, vb, 0, 0); |
189 | if (txd) { | 189 | if (txd) { |
190 | ichan = to_idmac_chan(txd->chan); | 190 | ichan = to_idmac_chan(txd->chan); |
191 | async_tx_ack(txd); | 191 | async_tx_ack(txd); |