diff options
| author | Johan Hovold <johan@kernel.org> | 2017-10-12 10:54:21 +0200 |
|---|---|---|
| committer | Johan Hovold <johan@kernel.org> | 2017-10-13 09:44:31 +0200 |
| commit | 2339536d229df25c71c0900fc619289229bfecf6 (patch) | |
| tree | 79ac90185548b3cf28cf9ba1fb6158783aa1ae20 /drivers/usb/serial/metro-usb.c | |
| parent | USB: serial: garmin_gps: simplify init-session logic (diff) | |
| download | linux-2339536d229df25c71c0900fc619289229bfecf6.tar.xz linux-2339536d229df25c71c0900fc619289229bfecf6.zip | |
USB: serial: metro-usb: stop I/O after failed open
Make sure to kill the interrupt-in URB after a failed open request.
Apart from saving power (and avoiding stale input after a later
successful open), this also prevents a NULL-deref in the completion
handler if the port is manually unbound.
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Fixes: 704577861d5e ("USB: serial: metro-usb: get data from device in Uni-Directional mode.")
Cc: stable <stable@vger.kernel.org> # 3.5
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial/metro-usb.c')
| -rw-r--r-- | drivers/usb/serial/metro-usb.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/usb/serial/metro-usb.c b/drivers/usb/serial/metro-usb.c index cc84da8dbb84..4bb29e03dae4 100644 --- a/drivers/usb/serial/metro-usb.c +++ b/drivers/usb/serial/metro-usb.c @@ -188,7 +188,7 @@ static int metrousb_open(struct tty_struct *tty, struct usb_serial_port *port) dev_err(&port->dev, "%s - failed submitting interrupt in urb, error code=%d\n", __func__, result); - goto exit; + return result; } /* Send activate cmd to device */ @@ -197,9 +197,14 @@ static int metrousb_open(struct tty_struct *tty, struct usb_serial_port *port) dev_err(&port->dev, "%s - failed to configure device, error code=%d\n", __func__, result); - goto exit; + goto err_kill_urb; } -exit: + + return 0; + +err_kill_urb: + usb_kill_urb(port->interrupt_in_urb); + return result; } |