patch-2.4.8 linux/drivers/usb/storage/scsiglue.c
Next file: linux/drivers/usb/storage/sddr09.c
Previous file: linux/drivers/usb/storage/protocol.h
Back to the patch index
Back to the overall index
- Lines: 66
- Date:
Sun Jul 29 21:11:50 2001
- Orig file:
v2.4.7/linux/drivers/usb/storage/scsiglue.c
- Orig date:
Fri Feb 9 11:30:23 2001
diff -u --recursive --new-file v2.4.7/linux/drivers/usb/storage/scsiglue.c linux/drivers/usb/storage/scsiglue.c
@@ -1,7 +1,7 @@
/* Driver for USB Mass Storage compliant devices
* SCSI layer glue code
*
- * $Id: scsiglue.c,v 1.19 2000/11/13 22:28:55 mdharm Exp $
+ * $Id: scsiglue.c,v 1.21 2001/07/29 23:41:52 mdharm Exp $
*
* Current development and maintenance by:
* (c) 1999, 2000 Matthew Dharm (mdharm-usb@one-eyed-alien.net)
@@ -49,7 +49,7 @@
#include "debug.h"
#include "transport.h"
-#include <linux/slab.h>
+#include <linux/malloc.h>
/*
* kernel thread actions
@@ -122,8 +122,9 @@
*/
US_DEBUGP("-- sending US_ACT_EXIT command to thread\n");
us->action = US_ACT_EXIT;
- wake_up(&(us->wqh));
- down(&(us->notify));
+
+ up(&(us->sema));
+ wait_for_completion(&(us->notify));
/* remove the pointer to the data structure we were using */
(struct us_data*)psh->hostdata[0] = NULL;
@@ -160,7 +161,7 @@
up(&(us->queue_exclusion));
/* wake up the process task */
- wake_up(&(us->wqh));
+ up(&(us->sema));
return 0;
}
@@ -194,7 +195,7 @@
usb_unlink_urb(us->current_urb);
/* wait for us to be done */
- down(&(us->notify));
+ wait_for_completion(&(us->notify));
return SUCCESS;
}
@@ -248,7 +249,7 @@
for (i = 0; i < us->pusb_dev->actconfig->bNumInterfaces; i++) {
struct usb_interface *intf =
&us->pusb_dev->actconfig->interface[i];
- const struct usb_device_id *id;
+ struct usb_device_id *id;
/* if this is an unclaimed interface, skip it */
if (!intf->driver) {
@@ -331,7 +332,7 @@
return -ESRCH;
}
- /* print the controler name */
+ /* print the controller name */
SPRINTF(" Host scsi%d: usb-storage\n", hostno);
/* print product, vendor, and serial number strings */
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)