diff options
author | Daniel Drake <dsd@gentoo.org> | 2006-05-08 20:45:27 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-21 18:04:10 -0400 |
commit | b383539e04c413e040d998aedcc120c49aa670da (patch) | |
tree | e926b4f73ec6929aa3b8a794e88ecc43d863e957 /drivers/usb/storage | |
parent | f9347c52347f24244c550871eab8ecb0fb5704d6 (diff) |
[PATCH] USB: usb-storage alauda: Fix transport info mismerge
Unfortunately it looks like the transport entry for this subdriver was merged
into the protocol section, making this driver unusable :(
Signed-off-by: Daniel Drake <dsd@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/storage')
-rw-r--r-- | drivers/usb/storage/usb.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c index dd108634348e..0142fe82f6b8 100644 --- a/drivers/usb/storage/usb.c +++ b/drivers/usb/storage/usb.c | |||
@@ -593,6 +593,15 @@ static int get_transport(struct us_data *us) | |||
593 | break; | 593 | break; |
594 | #endif | 594 | #endif |
595 | 595 | ||
596 | #ifdef CONFIG_USB_STORAGE_ALAUDA | ||
597 | case US_PR_ALAUDA: | ||
598 | us->transport_name = "Alauda Control/Bulk"; | ||
599 | us->transport = alauda_transport; | ||
600 | us->transport_reset = usb_stor_Bulk_reset; | ||
601 | us->max_lun = 1; | ||
602 | break; | ||
603 | #endif | ||
604 | |||
596 | default: | 605 | default: |
597 | return -EIO; | 606 | return -EIO; |
598 | } | 607 | } |
@@ -648,15 +657,6 @@ static int get_protocol(struct us_data *us) | |||
648 | break; | 657 | break; |
649 | #endif | 658 | #endif |
650 | 659 | ||
651 | #ifdef CONFIG_USB_STORAGE_ALAUDA | ||
652 | case US_PR_ALAUDA: | ||
653 | us->transport_name = "Alauda Control/Bulk"; | ||
654 | us->transport = alauda_transport; | ||
655 | us->transport_reset = usb_stor_Bulk_reset; | ||
656 | us->max_lun = 1; | ||
657 | break; | ||
658 | #endif | ||
659 | |||
660 | default: | 660 | default: |
661 | return -EIO; | 661 | return -EIO; |
662 | } | 662 | } |