diff options
author | Matthew Dharm <mdharm-usb@one-eyed-alien.net> | 2006-08-13 20:30:14 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-09-27 14:58:54 -0400 |
commit | dfe0d3ba20e860d0b9a16c4c6524180b8f93be05 (patch) | |
tree | 974215119e673fadf9ce5ebe8e1e372ecafa5bd8 /drivers/usb/storage/usb.c | |
parent | c07045412f21c5bb344244e8ec45671529e411bd (diff) |
USB Storage: add rio karma eject support
This changeset from Keith Bennett (via Bob Copeland) moves the Karma
initializer to its own file and adds trapping of the START_STOP command to
enable eject of the device.
Signed-off-by: Keith Bennett <keith@mcs.st-and.ac.uk>
Signed-off-by: Bob Copeland <me@bobcopeland.com>
Signed-off-by: Matthew Dharm <mdharm-usb@one-eyed-alien.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/storage/usb.c')
-rw-r--r-- | drivers/usb/storage/usb.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c index 8d7bdcb5924..b8d6031b097 100644 --- a/drivers/usb/storage/usb.c +++ b/drivers/usb/storage/usb.c | |||
@@ -98,6 +98,9 @@ | |||
98 | #ifdef CONFIG_USB_STORAGE_ALAUDA | 98 | #ifdef CONFIG_USB_STORAGE_ALAUDA |
99 | #include "alauda.h" | 99 | #include "alauda.h" |
100 | #endif | 100 | #endif |
101 | #ifdef CONFIG_USB_STORAGE_KARMA | ||
102 | #include "karma.h" | ||
103 | #endif | ||
101 | 104 | ||
102 | /* Some informational data */ | 105 | /* Some informational data */ |
103 | MODULE_AUTHOR("Matthew Dharm <mdharm-usb@one-eyed-alien.net>"); | 106 | MODULE_AUTHOR("Matthew Dharm <mdharm-usb@one-eyed-alien.net>"); |
@@ -646,6 +649,14 @@ static int get_transport(struct us_data *us) | |||
646 | break; | 649 | break; |
647 | #endif | 650 | #endif |
648 | 651 | ||
652 | #ifdef CONFIG_USB_STORAGE_KARMA | ||
653 | case US_PR_KARMA: | ||
654 | us->transport_name = "Rio Karma/Bulk"; | ||
655 | us->transport = rio_karma_transport; | ||
656 | us->transport_reset = usb_stor_Bulk_reset; | ||
657 | break; | ||
658 | #endif | ||
659 | |||
649 | default: | 660 | default: |
650 | return -EIO; | 661 | return -EIO; |
651 | } | 662 | } |