diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2009-05-22 01:37:58 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-16 08:44:46 +0400 |
| commit | be475d9027a07069407a19980d1a4fcb7b18b23c (patch) | |
| tree | 7af3bcb99fb70d12c2c0f0b9c47e196560241eff /drivers/usb | |
| parent | 9a4b5e36ce58febdd2039dd4d129ee7edf4f5536 (diff) | |
| download | linux-be475d9027a07069407a19980d1a4fcb7b18b23c.tar.xz | |
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: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/storage/option_ms.c | 8 | ||||
| -rw-r--r-- | drivers/usb/storage/sierra_ms.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/storage/option_ms.c b/drivers/usb/storage/option_ms.c index 126ea3424c03..0d8853339bb6 100644 --- a/drivers/usb/storage/option_ms.c +++ b/drivers/usb/storage/option_ms.c @@ -96,7 +96,7 @@ int option_ms_init(struct us_data *us) udev->descriptor.bDeviceSubClass != 0 || udev->descriptor.bDeviceProtocol != 0 || udev->actconfig->desc.bNumInterfaces == 3) - return USB_STOR_TRANSPORT_GOOD; + return 0; 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) { US_DEBUGP("Option MS: mass storage interface not found, no action " "required\n"); - return USB_STOR_TRANSPORT_GOOD; + return 0; } /* 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) { US_DEBUGP("Option MS: mass storage endpoints not found, no action " "required\n"); - return USB_STOR_TRANSPORT_GOOD; + return 0; } /* Force Modem mode */ @@ -143,6 +143,6 @@ int option_ms_init(struct us_data *us) " requests it\n"); } - return USB_STOR_TRANSPORT_GOOD; + return 0; } diff --git a/drivers/usb/storage/sierra_ms.c b/drivers/usb/storage/sierra_ms.c index 4359a2cb42df..4395c4100ec2 100644 --- a/drivers/usb/storage/sierra_ms.c +++ b/drivers/usb/storage/sierra_ms.c @@ -202,6 +202,6 @@ int sierra_ms_init(struct us_data *us) complete: result = device_create_file(&us->pusb_intf->dev, &dev_attr_truinst); - return USB_STOR_TRANSPORT_GOOD; + return 0; } |