diff options
Diffstat (limited to 'drivers/usb/storage/datafab.c')
-rw-r--r-- | drivers/usb/storage/datafab.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/usb/storage/datafab.c b/drivers/usb/storage/datafab.c index 7b17c2169812..aa4f51944a4a 100644 --- a/drivers/usb/storage/datafab.c +++ b/drivers/usb/storage/datafab.c | |||
@@ -59,6 +59,9 @@ | |||
59 | #include "transport.h" | 59 | #include "transport.h" |
60 | #include "protocol.h" | 60 | #include "protocol.h" |
61 | #include "debug.h" | 61 | #include "debug.h" |
62 | #include "scsiglue.h" | ||
63 | |||
64 | #define DRV_NAME "ums-datafab" | ||
62 | 65 | ||
63 | MODULE_DESCRIPTION("Driver for Datafab USB Compact Flash reader"); | 66 | MODULE_DESCRIPTION("Driver for Datafab USB Compact Flash reader"); |
64 | MODULE_AUTHOR("Jimmie Mayfield <mayfield+datafab@sackheads.org>"); | 67 | MODULE_AUTHOR("Jimmie Mayfield <mayfield+datafab@sackheads.org>"); |
@@ -721,6 +724,8 @@ static int datafab_transport(struct scsi_cmnd *srb, struct us_data *us) | |||
721 | return USB_STOR_TRANSPORT_FAILED; | 724 | return USB_STOR_TRANSPORT_FAILED; |
722 | } | 725 | } |
723 | 726 | ||
727 | static struct scsi_host_template datafab_host_template; | ||
728 | |||
724 | static int datafab_probe(struct usb_interface *intf, | 729 | static int datafab_probe(struct usb_interface *intf, |
725 | const struct usb_device_id *id) | 730 | const struct usb_device_id *id) |
726 | { | 731 | { |
@@ -728,7 +733,8 @@ static int datafab_probe(struct usb_interface *intf, | |||
728 | int result; | 733 | int result; |
729 | 734 | ||
730 | result = usb_stor_probe1(&us, intf, id, | 735 | result = usb_stor_probe1(&us, intf, id, |
731 | (id - datafab_usb_ids) + datafab_unusual_dev_list); | 736 | (id - datafab_usb_ids) + datafab_unusual_dev_list, |
737 | &datafab_host_template); | ||
732 | if (result) | 738 | if (result) |
733 | return result; | 739 | return result; |
734 | 740 | ||
@@ -742,7 +748,7 @@ static int datafab_probe(struct usb_interface *intf, | |||
742 | } | 748 | } |
743 | 749 | ||
744 | static struct usb_driver datafab_driver = { | 750 | static struct usb_driver datafab_driver = { |
745 | .name = "ums-datafab", | 751 | .name = DRV_NAME, |
746 | .probe = datafab_probe, | 752 | .probe = datafab_probe, |
747 | .disconnect = usb_stor_disconnect, | 753 | .disconnect = usb_stor_disconnect, |
748 | .suspend = usb_stor_suspend, | 754 | .suspend = usb_stor_suspend, |
@@ -755,4 +761,4 @@ static struct usb_driver datafab_driver = { | |||
755 | .no_dynamic_id = 1, | 761 | .no_dynamic_id = 1, |
756 | }; | 762 | }; |
757 | 763 | ||
758 | module_usb_driver(datafab_driver); | 764 | module_usb_stor_driver(datafab_driver, datafab_host_template, DRV_NAME); |