lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Stern
2009-05-21 17:37:58 -04:00
committed by Greg Kroah-Hartman
parent 9a4b5e36ce
commit be475d9027
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/usb/storage/option_ms.c
View File

@@ -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)
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)
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)
" requests it\n"); " requests it\n");
} }
return USB_STOR_TRANSPORT_GOOD; return 0;
} }

2
drivers/usb/storage/sierra_ms.c
View File

@@ -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;
} }