From: Greg Kroah-Hartman <greg@kroah.com>
Date: Tue, 5 Feb 2002 09:17:21 +0000 (-0800)
Subject: [PATCH] USB vicam driver update
X-Git-Tag: v2.5.4-pre1~15
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=25562ed9f3bd71d80577fbbc484532b7d7db454f;p=history.git

[PATCH] USB vicam driver update

Here's a patch against 2.5.3 for the USB vicam driver that removes the
use of interruptible_sleep_on() in the driver.  This patch was done by
Oliver Neukum.
---

diff --git a/drivers/usb/vicam.c b/drivers/usb/vicam.c
index 069383fac14f..d7dc679d5461 100644
--- a/drivers/usb/vicam.c
+++ b/drivers/usb/vicam.c
@@ -79,7 +79,7 @@ static int video_nr = -1; 		/* next avail video device */
 static struct usb_driver vicam_driver;
 
 static char *buf, *buf2;
-static int change_pending = 0; 
+static volatile int change_pending = 0; 
 
 static int vicam_parameters(struct usb_vicam *vicam);
 
@@ -330,8 +330,14 @@ static int vicam_get_picture(struct usb_vicam *vicam, struct video_picture *p)
 
 static void synchronize(struct usb_vicam *vicam)
 {
+	DECLARE_WAITQUEUE(wait, current);
 	change_pending = 1;
-	interruptible_sleep_on(&vicam->wait);
+	set_current_state(TASK_INTERRUPTIBLE);
+	add_wait_queue(&vicam->wait, &wait);
+	if (change_pending)
+		schedule();
+	remove_wait_queue(&vicam->wait, &wait);
+	set_current_state(TASK_RUNNING);
 	vicam_sndctrl(1, vicam, VICAM_REQ_CAMERA_POWER, 0x00, NULL, 0);
 	mdelay(10);
 	vicam_sndctrl(1, vicam, VICAM_REQ_LED_CONTROL, 0x00, NULL, 0);