aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/platform/arv.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/platform/arv.c b/drivers/media/platform/arv.c
index e346d32d08ce..e9410e41ae0c 100644
--- a/drivers/media/platform/arv.c
+++ b/drivers/media/platform/arv.c
@@ -109,7 +109,7 @@ extern struct cpuinfo_m32r boot_cpu_data;
109struct ar { 109struct ar {
110 struct v4l2_device v4l2_dev; 110 struct v4l2_device v4l2_dev;
111 struct video_device vdev; 111 struct video_device vdev;
112 unsigned int start_capture; /* duaring capture in INT. mode. */ 112 int start_capture; /* duaring capture in INT. mode. */
113#if USE_INT 113#if USE_INT
114 unsigned char *line_buff; /* DMA line buffer */ 114 unsigned char *line_buff; /* DMA line buffer */
115#endif 115#endif
@@ -307,11 +307,11 @@ static ssize_t ar_read(struct file *file, char *buf, size_t count, loff_t *ppos)
307 /* 307 /*
308 * Okay, kick AR LSI to invoke an interrupt 308 * Okay, kick AR LSI to invoke an interrupt
309 */ 309 */
310 ar->start_capture = 0; 310 ar->start_capture = -1;
311 ar_outl(arvcr1 | ARVCR1_HIEN, ARVCR1); 311 ar_outl(arvcr1 | ARVCR1_HIEN, ARVCR1);
312 local_irq_restore(flags); 312 local_irq_restore(flags);
313 /* .... AR interrupts .... */ 313 /* .... AR interrupts .... */
314 interruptible_sleep_on(&ar->wait); 314 wait_event_interruptible(ar->wait, ar->start_capture == 0);
315 if (signal_pending(current)) { 315 if (signal_pending(current)) {
316 printk(KERN_ERR "arv: interrupted while get frame data.\n"); 316 printk(KERN_ERR "arv: interrupted while get frame data.\n");
317 ret = -EINTR; 317 ret = -EINTR;