1 files changed, 41 insertions, 13 deletions

diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index e232c7c8990..b8d6031b097 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -47,7 +47,6 @@
  * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/config.h>
 #include <linux/sched.h>
 #include <linux/errno.h>
 #include <linux/suspend.h>
@@ -56,6 +55,7 @@
 #include <linux/slab.h>
 #include <linux/kthread.h>
 #include <linux/mutex.h>
+#include <linux/utsrelease.h>
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
@@ -98,6 +98,9 @@
 #ifdef CONFIG_USB_STORAGE_ALAUDA
 #include "alauda.h"
 #endif
+#ifdef CONFIG_USB_STORAGE_KARMA
+#include "karma.h"
+#endif
 
 /* Some informational data */
 MODULE_AUTHOR("Matthew Dharm <mdharm-usb@one-eyed-alien.net>");
@@ -374,8 +377,12 @@ static int usb_stor_control_thread(void * __us)
                 /* lock access to the state */
                 scsi_lock(host);
 
+                /* did the command already complete because of a disconnect? */
+                if (!us->srb)
+                        ;               /* nothing to do */
+
                 /* indicate that the command is done */
-                if (us->srb->result != DID_ABORT << 16) {
+                else if (us->srb->result != DID_ABORT << 16) {
                         US_DEBUGP("scsi cmd done, result=0x%x\n", 
                                    us->srb->result);
                         us->srb->scsi_done(us->srb);
@@ -479,7 +486,7 @@ static struct us_unusual_dev *find_unusual(const struct usb_device_id *id)
 }
 
 /* Get the unusual_devs entries and the string descriptors */
-static void get_device_info(struct us_data *us, const struct usb_device_id *id)
+static int get_device_info(struct us_data *us, const struct usb_device_id *id)
 {
         struct usb_device *dev = us->pusb_dev;
         struct usb_interface_descriptor *idesc =
@@ -496,6 +503,11 @@ static void get_device_info(struct us_data *us, const struct usb_device_id *id)
                         unusual_dev->useTransport;
         us->flags = USB_US_ORIG_FLAGS(id->driver_info);
 
+        if (us->flags & US_FL_IGNORE_DEVICE) {
+                printk(KERN_INFO USB_STORAGE "device ignored\n");
+                return -ENODEV;
+        }
+
         /*
          * This flag is only needed when we're in high-speed, so let's
          * disable it if we're in full-speed
@@ -525,7 +537,8 @@ static void get_device_info(struct us_data *us, const struct usb_device_id *id)
                 if (msg >= 0 && !(us->flags & US_FL_NEED_OVERRIDE))
                         printk(KERN_NOTICE USB_STORAGE "This device "
                                 "(%04x,%04x,%04x S %02x P %02x)"
-                                " has %s in unusual_devs.h\n"
+                                " has %s in unusual_devs.h (kernel"
+                                " %s)\n"
                                 "   Please send a copy of this message to "
                                 "<linux-usb-devel@lists.sourceforge.net>\n",
                                 le16_to_cpu(ddesc->idVendor),
@@ -533,8 +546,11 @@ static void get_device_info(struct us_data *us, const struct usb_device_id *id)
                                 le16_to_cpu(ddesc->bcdDevice),
                                 idesc->bInterfaceSubClass,
                                 idesc->bInterfaceProtocol,
-                                msgs[msg]);
+                                msgs[msg],
+                                UTS_RELEASE);
         }
+
+        return 0;
 }
 
 /* Get the transport settings */
@@ -633,6 +649,14 @@ static int get_transport(struct us_data *us)
                 break;
 #endif
 
+#ifdef CONFIG_USB_STORAGE_KARMA
+        case US_PR_KARMA:
+                us->transport_name = "Rio Karma/Bulk";
+                us->transport = rio_karma_transport;
+                us->transport_reset = usb_stor_Bulk_reset;
+                break;
+#endif
+
         default:
                 return -EIO;
         }
@@ -837,32 +861,34 @@ static void dissociate_dev(struct us_data *us)
  * the host */
 static void quiesce_and_remove_host(struct us_data *us)
 {
+        struct Scsi_Host *host = us_to_host(us);
+
         /* Prevent new USB transfers, stop the current command, and
          * interrupt a SCSI-scan or device-reset delay */
+        scsi_lock(host);
         set_bit(US_FLIDX_DISCONNECTING, &us->flags);
+        scsi_unlock(host);
         usb_stor_stop_transport(us);
         wake_up(&us->delay_wait);
 
         /* It doesn't matter if the SCSI-scanning thread is still running.
          * The thread will exit when it sees the DISCONNECTING flag. */
 
-        /* Wait for the current command to finish, then remove the host */
-        mutex_lock(&us->dev_mutex);
-        mutex_unlock(&us->dev_mutex);
-
         /* queuecommand won't accept any new commands and the control
          * thread won't execute a previously-queued command.  If there
          * is such a command pending, complete it with an error. */
+        mutex_lock(&us->dev_mutex);
         if (us->srb) {
                 us->srb->result = DID_NO_CONNECT << 16;
-                scsi_lock(us_to_host(us));
+                scsi_lock(host);
                 us->srb->scsi_done(us->srb);
                 us->srb = NULL;
-                scsi_unlock(us_to_host(us));
+                scsi_unlock(host);
         }
+        mutex_unlock(&us->dev_mutex);
 
         /* Now we own no commands so it's safe to remove the SCSI host */
-        scsi_remove_host(us_to_host(us));
+        scsi_remove_host(host);
 }
 
 /* Second stage of disconnect processing: deallocate all resources */
@@ -961,7 +987,9 @@ static int storage_probe(struct usb_interface *intf,
          * of the match from the usb_device_id table, so we can find the
          * corresponding entry in the private table.
          */
-        get_device_info(us, id);
+        result = get_device_info(us, id);
+        if (result)
+                goto BadDevice;
 
         /* Get the transport, protocol, and pipe settings */
         result = get_transport(us);