diff options
Diffstat (limited to 'drivers/usb/storage/usb.c')
-rw-r--r-- | drivers/usb/storage/usb.c | 22 |
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) |