1 files changed, 11 insertions, 5 deletions

diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index 6c10c888f35f..43576ed31ccd 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -76,6 +76,8 @@
 #include "uas-detect.h"
 #endif
 
+#define DRV_NAME "usb-storage"
+
 /* Some informational data */
 MODULE_AUTHOR("Matthew Dharm <mdharm-usb@one-eyed-alien.net>");
 MODULE_DESCRIPTION("USB Mass Storage driver for Linux");
@@ -924,7 +926,8 @@ static unsigned int usb_stor_sg_tablesize(struct usb_interface *intf)
 int usb_stor_probe1(struct us_data **pus,
                 struct usb_interface *intf,
                 const struct usb_device_id *id,
-                struct us_unusual_dev *unusual_dev)
+                struct us_unusual_dev *unusual_dev,
+                struct scsi_host_template *sht)
 {
         struct Scsi_Host *host;
         struct us_data *us;
@@ -936,7 +939,7 @@ int usb_stor_probe1(struct us_data **pus,
          * Ask the SCSI layer to allocate a host structure, with extra
          * space at the end for our private us_data structure.
          */
-        host = scsi_host_alloc(&usb_stor_host_template, sizeof(*us));
+        host = scsi_host_alloc(sht, sizeof(*us));
         if (!host) {
                 dev_warn(&intf->dev, "Unable to allocate the scsi host\n");
                 return -ENOMEM;
@@ -1073,6 +1076,8 @@ void usb_stor_disconnect(struct usb_interface *intf)
 }
 EXPORT_SYMBOL_GPL(usb_stor_disconnect);
 
+static struct scsi_host_template usb_stor_host_template;
+
 /* The main probe routine for standard devices */
 static int storage_probe(struct usb_interface *intf,
                          const struct usb_device_id *id)
@@ -1113,7 +1118,8 @@ static int storage_probe(struct usb_interface *intf,
                         id->idVendor, id->idProduct);
         }
 
-        result = usb_stor_probe1(&us, intf, id, unusual_dev);
+        result = usb_stor_probe1(&us, intf, id, unusual_dev,
+                                 &usb_stor_host_template);
         if (result)
                 return result;
 
@@ -1124,7 +1130,7 @@ static int storage_probe(struct usb_interface *intf,
 }
 
 static struct usb_driver usb_storage_driver = {
-        .name =         "usb-storage",
+        .name =         DRV_NAME,
         .probe =        storage_probe,
         .disconnect =   usb_stor_disconnect,
         .suspend =      usb_stor_suspend,
@@ -1137,4 +1143,4 @@ static struct usb_driver usb_storage_driver = {
         .soft_unbind =  1,
 };
 
-module_usb_driver(usb_storage_driver);
+module_usb_stor_driver(usb_storage_driver, usb_stor_host_template, DRV_NAME);