aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/storage/usb.c
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2008-11-20 14:20:03 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-07 09:59:57 -0800
commit64648a9dc4d7ac0189364188207310ec6bc75bbe (patch)
treed66c3054df85828f7910822b8dc8f0d5ebf17da4 /drivers/usb/storage/usb.c
parent12aae68a203e97a58d3f8237fc389201a4d9282d (diff)
downloadmrst-s0i3-test-64648a9dc4d7ac0189364188207310ec6bc75bbe.tar.gz
mrst-s0i3-test-64648a9dc4d7ac0189364188207310ec6bc75bbe.tar.xz
mrst-s0i3-test-64648a9dc4d7ac0189364188207310ec6bc75bbe.zip
USB: usb-storage: merge CB and CBI transport routines
This patch (as1173) merges usb-storage's CB and CBI transports into a single routine. So much of their code is common, it's silly to keep them separate. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> CC: 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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index 099e07c6af7..cdd009fae3c 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -591,7 +591,7 @@ static int get_transport(struct us_data *us)
case US_PR_CBI:
us->transport_name = "Control/Bulk/Interrupt";
- us->transport = usb_stor_CBI_transport;
+ us->transport = usb_stor_CB_transport;
us->transport_reset = usb_stor_CB_reset;
us->max_lun = 7;
break;