diff options
Diffstat (limited to 'drivers/usb/serial/aircable.c')
-rw-r--r-- | drivers/usb/serial/aircable.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/usb/serial/aircable.c b/drivers/usb/serial/aircable.c index 812275509137..b1b5707bc99a 100644 --- a/drivers/usb/serial/aircable.c +++ b/drivers/usb/serial/aircable.c | |||
@@ -270,8 +270,11 @@ static void aircable_read(void *params) | |||
270 | */ | 270 | */ |
271 | tty = port->tty; | 271 | tty = port->tty; |
272 | 272 | ||
273 | if (!tty) | 273 | if (!tty) { |
274 | schedule_work(&priv->rx_work); | 274 | schedule_work(&priv->rx_work); |
275 | err("%s - No tty available", __FUNCTION__); | ||
276 | return ; | ||
277 | } | ||
275 | 278 | ||
276 | count = min(64, serial_buf_data_avail(priv->rx_buf)); | 279 | count = min(64, serial_buf_data_avail(priv->rx_buf)); |
277 | 280 | ||
@@ -305,9 +308,7 @@ static int aircable_probe(struct usb_serial *serial, | |||
305 | 308 | ||
306 | for (i = 0; i < iface_desc->desc.bNumEndpoints; i++) { | 309 | for (i = 0; i < iface_desc->desc.bNumEndpoints; i++) { |
307 | endpoint = &iface_desc->endpoint[i].desc; | 310 | endpoint = &iface_desc->endpoint[i].desc; |
308 | if (((endpoint->bEndpointAddress & 0x80) == 0x00) && | 311 | if (usb_endpoint_is_bulk_out(endpoint)) { |
309 | ((endpoint->bmAttributes & 3) == 0x02)) { | ||
310 | /* we found our bulk out endpoint */ | ||
311 | dbg("found bulk out on endpoint %d", i); | 312 | dbg("found bulk out on endpoint %d", i); |
312 | ++num_bulk_out; | 313 | ++num_bulk_out; |
313 | } | 314 | } |