Commit be475d90 authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman

USB: usb-storage: fix return values from init functions

This patch (as1242) fixes the return values from the special
init functions in usb-storage.  They are supposed to return 0 for
success, not USB_STOR_TRANSPORT_GOOD.
Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9a4b5e36
...@@ -96,7 +96,7 @@ int option_ms_init(struct us_data *us) ...@@ -96,7 +96,7 @@ int option_ms_init(struct us_data *us)
udev->descriptor.bDeviceSubClass != 0 || udev->descriptor.bDeviceSubClass != 0 ||
udev->descriptor.bDeviceProtocol != 0 || udev->descriptor.bDeviceProtocol != 0 ||
udev->actconfig->desc.bNumInterfaces == 3) udev->actconfig->desc.bNumInterfaces == 3)
return USB_STOR_TRANSPORT_GOOD; return 0;
US_DEBUGP("Option MS: option_ms_init called\n"); US_DEBUGP("Option MS: option_ms_init called\n");
...@@ -107,7 +107,7 @@ int option_ms_init(struct us_data *us) ...@@ -107,7 +107,7 @@ int option_ms_init(struct us_data *us)
iface_desc->desc.bInterfaceProtocol != 0x50) { iface_desc->desc.bInterfaceProtocol != 0x50) {
US_DEBUGP("Option MS: mass storage interface not found, no action " US_DEBUGP("Option MS: mass storage interface not found, no action "
"required\n"); "required\n");
return USB_STOR_TRANSPORT_GOOD; return 0;
} }
/* Find the mass storage bulk endpoints */ /* Find the mass storage bulk endpoints */
...@@ -127,7 +127,7 @@ int option_ms_init(struct us_data *us) ...@@ -127,7 +127,7 @@ int option_ms_init(struct us_data *us)
if (!ep_in_size || !ep_out_size) { if (!ep_in_size || !ep_out_size) {
US_DEBUGP("Option MS: mass storage endpoints not found, no action " US_DEBUGP("Option MS: mass storage endpoints not found, no action "
"required\n"); "required\n");
return USB_STOR_TRANSPORT_GOOD; return 0;
} }
/* Force Modem mode */ /* Force Modem mode */
...@@ -143,6 +143,6 @@ int option_ms_init(struct us_data *us) ...@@ -143,6 +143,6 @@ int option_ms_init(struct us_data *us)
" requests it\n"); " requests it\n");
} }
return USB_STOR_TRANSPORT_GOOD; return 0;
} }
...@@ -202,6 +202,6 @@ int sierra_ms_init(struct us_data *us) ...@@ -202,6 +202,6 @@ int sierra_ms_init(struct us_data *us)
complete: complete:
result = device_create_file(&us->pusb_intf->dev, &dev_attr_truinst); result = device_create_file(&us->pusb_intf->dev, &dev_attr_truinst);
return USB_STOR_TRANSPORT_GOOD; return 0;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment