aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/storage/karma.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/storage/karma.c')
-rw-r--r--drivers/usb/storage/karma.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/usb/storage/karma.c b/drivers/usb/storage/karma.c
index 94d16ee5e84b..ae201e69475c 100644
--- a/drivers/usb/storage/karma.c
+++ b/drivers/usb/storage/karma.c
@@ -28,6 +28,9 @@
28#include "usb.h" 28#include "usb.h"
29#include "transport.h" 29#include "transport.h"
30#include "debug.h" 30#include "debug.h"
31#include "scsiglue.h"
32
33#define DRV_NAME "ums-karma"
31 34
32MODULE_DESCRIPTION("Driver for Rio Karma"); 35MODULE_DESCRIPTION("Driver for Rio Karma");
33MODULE_AUTHOR("Bob Copeland <me@bobcopeland.com>, Keith Bennett <keith@mcs.st-and.ac.uk>"); 36MODULE_AUTHOR("Bob Copeland <me@bobcopeland.com>, Keith Bennett <keith@mcs.st-and.ac.uk>");
@@ -200,6 +203,8 @@ out:
200 return ret; 203 return ret;
201} 204}
202 205
206static struct scsi_host_template karma_host_template;
207
203static int karma_probe(struct usb_interface *intf, 208static int karma_probe(struct usb_interface *intf,
204 const struct usb_device_id *id) 209 const struct usb_device_id *id)
205{ 210{
@@ -207,7 +212,8 @@ static int karma_probe(struct usb_interface *intf,
207 int result; 212 int result;
208 213
209 result = usb_stor_probe1(&us, intf, id, 214 result = usb_stor_probe1(&us, intf, id,
210 (id - karma_usb_ids) + karma_unusual_dev_list); 215 (id - karma_usb_ids) + karma_unusual_dev_list,
216 &karma_host_template);
211 if (result) 217 if (result)
212 return result; 218 return result;
213 219
@@ -220,7 +226,7 @@ static int karma_probe(struct usb_interface *intf,
220} 226}
221 227
222static struct usb_driver karma_driver = { 228static struct usb_driver karma_driver = {
223 .name = "ums-karma", 229 .name = DRV_NAME,
224 .probe = karma_probe, 230 .probe = karma_probe,
225 .disconnect = usb_stor_disconnect, 231 .disconnect = usb_stor_disconnect,
226 .suspend = usb_stor_suspend, 232 .suspend = usb_stor_suspend,
@@ -233,4 +239,4 @@ static struct usb_driver karma_driver = {
233 .no_dynamic_id = 1, 239 .no_dynamic_id = 1,
234}; 240};
235 241
236module_usb_driver(karma_driver); 242module_usb_stor_driver(karma_driver, karma_host_template, DRV_NAME);