diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/usb/serial/omninet.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/usb/serial/omninet.c')
| -rw-r--r-- | drivers/usb/serial/omninet.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c index 89c724c0ac0a..60f38d5e64fc 100644 --- a/drivers/usb/serial/omninet.c +++ b/drivers/usb/serial/omninet.c | |||
| @@ -246,8 +246,6 @@ static void omninet_read_bulk_callback(struct urb *urb) | |||
| 246 | dev_err(&port->dev, | 246 | dev_err(&port->dev, |
| 247 | "%s - failed resubmitting read urb, error %d\n", | 247 | "%s - failed resubmitting read urb, error %d\n", |
| 248 | __func__, result); | 248 | __func__, result); |
| 249 | |||
| 250 | return; | ||
| 251 | } | 249 | } |
| 252 | 250 | ||
| 253 | static int omninet_write(struct tty_struct *tty, struct usb_serial_port *port, | 251 | static int omninet_write(struct tty_struct *tty, struct usb_serial_port *port, |