aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/storage/usb.c
diff options
context:
space:
mode:
authorMatthew Dharm <mdharm-usb@one-eyed-alien.net>2005-12-05 00:57:51 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2006-01-04 16:51:41 -0500
commitf5b8cb9c91f2f7d54dc3f066db8d4e0f041de79b (patch)
tree87c0ffd6678cffdd5d9c9425d8f8432ceebc1c33 /drivers/usb/storage/usb.c
parent7931e1c6f8007d5fef8a0bb2dc71bd97315eeae9 (diff)
[PATCH] USB Storage: cleanups of sddr09
This is the first of three patches to prepare the sddr09 subdriver for conversion to the Sim-SCSI framework. This patch (as594) straightens out the initialization procedures and headers: Some ugly code from usb.c was moved into sddr09.c. Set-up of the private data structures was moved into the initialization routine. The connection between the "dpcm" version and the standalone version was clarified. A private declaration was moved from a header file into the subdriver's .c file. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Acked-by: Andries Brouwer <Andries.Brouwer@cwi.nl> 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.c22
1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index ca02ae97be86..85c8c17b3c0c 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -919,28 +919,6 @@ static int storage_probe(struct usb_interface *intf,
919 */ 919 */
920 get_device_info(us, id); 920 get_device_info(us, id);
921 921
922#ifdef CONFIG_USB_STORAGE_SDDR09
923 if (us->protocol == US_PR_EUSB_SDDR09 ||
924 us->protocol == US_PR_DPCM_USB) {
925 /* set the configuration -- STALL is an acceptable response here */
926 if (us->pusb_dev->actconfig->desc.bConfigurationValue != 1) {
927 US_DEBUGP("active config #%d != 1 ??\n", us->pusb_dev
928 ->actconfig->desc.bConfigurationValue);
929 goto BadDevice;
930 }
931 result = usb_reset_configuration(us->pusb_dev);
932
933 US_DEBUGP("Result of usb_reset_configuration is %d\n", result);
934 if (result == -EPIPE) {
935 US_DEBUGP("-- stall on control interface\n");
936 } else if (result != 0) {
937 /* it's not a stall, but another error -- time to bail */
938 US_DEBUGP("-- Unknown error. Rejecting device\n");
939 goto BadDevice;
940 }
941 }
942#endif
943
944 /* Get the transport, protocol, and pipe settings */ 922 /* Get the transport, protocol, and pipe settings */
945 result = get_transport(us); 923 result = get_transport(us);
946 if (result) 924 if (result)