From 84d0a825ac2ab61e4b26031edd0bded1deff1669 Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Thu, 21 May 2009 17:37:58 -0400 Subject: [PATCH] --- yaml --- r: 151376 b: refs/heads/master c: be475d9027a07069407a19980d1a4fcb7b18b23c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/storage/option_ms.c | 8 ++++---- trunk/drivers/usb/storage/sierra_ms.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 38decd0d5691..11c04b24b3be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a4b5e36ce58febdd2039dd4d129ee7edf4f5536 +refs/heads/master: be475d9027a07069407a19980d1a4fcb7b18b23c diff --git a/trunk/drivers/usb/storage/option_ms.c b/trunk/drivers/usb/storage/option_ms.c index 126ea3424c03..0d8853339bb6 100644 --- a/trunk/drivers/usb/storage/option_ms.c +++ b/trunk/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/trunk/drivers/usb/storage/sierra_ms.c b/trunk/drivers/usb/storage/sierra_ms.c index 4359a2cb42df..4395c4100ec2 100644 --- a/trunk/drivers/usb/storage/sierra_ms.c +++ b/trunk/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; }