patch-2.4.0-test7 linux/drivers/usb/storage/scsiglue.c

• Lines: 22
• Date: Tue Aug 22 09:06:31 2000
• Orig file: v2.4.0-test6/linux/drivers/usb/storage/scsiglue.c
• Orig date: Wed Aug 9 19:19:51 2000

diff -u --recursive --new-file v2.4.0-test6/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.7 2000/07/28 20:33:18 gowdy Exp $
+ * $Id: scsiglue.c,v 1.8 2000/08/11 23:15:05 mdharm Exp $
  *
  * Current development and maintainance by:
  *   (c) 1999, 2000 Matthew Dharm (mdharm-usb@one-eyed-alien.net)
@@ -187,6 +187,12 @@
 		US_DEBUGP("-- simulating missing IRQ\n");
 		up(&(us->ip_waitq));
 		return SUCCESS;
+	}
+
+	/* This is a sanity check that we should never hit */
+	if (in_interrupt()) {
+		printk(KERN_ERR "usb-storage: command_abort() called from an interrupt!!! BAD!!! BAD!! BAD!!\n");
+		return FAILED;
 	}
 
 	/* if we have an urb pending, let's wake the control thread up */