aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/storage/usb.c
diff options
context:
space:
mode:
authorDaniel Drake <dsd@gentoo.org>2006-05-09 01:45:27 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2006-06-21 15:04:10 -0700
commitb383539e04c413e040d998aedcc120c49aa670da (patch)
treee926b4f73ec6929aa3b8a794e88ecc43d863e957 /drivers/usb/storage/usb.c
parentf9347c52347f24244c550871eab8ecb0fb5704d6 (diff)
downloadlinux-b383539e04c413e040d998aedcc120c49aa670da.tar.gz
[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/usb.c')
-rw-r--r--drivers/usb/storage/usb.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index dd108634348e3f..0142fe82f6b874 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)
break;
#endif
+#ifdef CONFIG_USB_STORAGE_ALAUDA
+ case US_PR_ALAUDA:
+ us->transport_name = "Alauda Control/Bulk";
+ us->transport = alauda_transport;
+ us->transport_reset = usb_stor_Bulk_reset;
+ us->max_lun = 1;
+ break;
+#endif
+
default:
return -EIO;
}
@@ -648,15 +657,6 @@ static int get_protocol(struct us_data *us)
break;
#endif
-#ifdef CONFIG_USB_STORAGE_ALAUDA
- case US_PR_ALAUDA:
- us->transport_name = "Alauda Control/Bulk";
- us->transport = alauda_transport;
- us->transport_reset = usb_stor_Bulk_reset;
- us->max_lun = 1;
- break;
-#endif
-
default:
return -EIO;
}