diff options
Diffstat (limited to 'drivers/usb/gadget/ncm.c')
-rw-r--r-- | drivers/usb/gadget/ncm.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/usb/gadget/ncm.c b/drivers/usb/gadget/ncm.c index b21ec269b8f..a22ad9af056 100644 --- a/drivers/usb/gadget/ncm.c +++ b/drivers/usb/gadget/ncm.c | |||
@@ -139,7 +139,6 @@ static struct usb_configuration ncm_config_driver = { | |||
139 | 139 | ||
140 | static int __init gncm_bind(struct usb_composite_dev *cdev) | 140 | static int __init gncm_bind(struct usb_composite_dev *cdev) |
141 | { | 141 | { |
142 | int gcnum; | ||
143 | struct usb_gadget *gadget = cdev->gadget; | 142 | struct usb_gadget *gadget = cdev->gadget; |
144 | int status; | 143 | int status; |
145 | 144 | ||
@@ -148,22 +147,6 @@ static int __init gncm_bind(struct usb_composite_dev *cdev) | |||
148 | if (status < 0) | 147 | if (status < 0) |
149 | return status; | 148 | return status; |
150 | 149 | ||
151 | gcnum = usb_gadget_controller_number(gadget); | ||
152 | if (gcnum >= 0) | ||
153 | device_desc.bcdDevice = cpu_to_le16(0x0300 | gcnum); | ||
154 | else { | ||
155 | /* We assume that can_support_ecm() tells the truth; | ||
156 | * but if the controller isn't recognized at all then | ||
157 | * that assumption is a bit more likely to be wrong. | ||
158 | */ | ||
159 | dev_warn(&gadget->dev, | ||
160 | "controller '%s' not recognized; trying %s\n", | ||
161 | gadget->name, | ||
162 | ncm_config_driver.label); | ||
163 | device_desc.bcdDevice = | ||
164 | cpu_to_le16(0x0300 | 0x0099); | ||
165 | } | ||
166 | |||
167 | /* Allocate string descriptor numbers ... note that string | 150 | /* Allocate string descriptor numbers ... note that string |
168 | * contents can be overridden by the composite_dev glue. | 151 | * contents can be overridden by the composite_dev glue. |
169 | */ | 152 | */ |