Alan Cox | 27 Jun 2012 13:21
Picon

[PATCH 02/12] usb: fix sillies in the metro USB driver

From: Alan Cox <alan <at> linux.intel.com>

Bits noticed doing the termios conversion

Signed-off-by: Alan Cox <alan <at> linux.intel.com>
---

 drivers/usb/serial/metro-usb.c |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/usb/serial/metro-usb.c b/drivers/usb/serial/metro-usb.c
index 81423f7..bad5f0c 100644
--- a/drivers/usb/serial/metro-usb.c
+++ b/drivers/usb/serial/metro-usb.c
 <at>  <at>  -130,20 +130,14  <at>  <at>  static void metrousb_read_int_callback(struct urb *urb)

 	/* Set the data read from the usb port into the serial port buffer. */
 	tty = tty_port_tty_get(&port->port);
-	if (!tty) {
-		dev_err(&port->dev, "%s - bad tty pointer - exiting\n",
-			__func__);
-		return;
-	}
-
 	if (tty && urb->actual_length) {
 		/* Loop through the data copying each byte to the tty layer. */
 		tty_insert_flip_string(tty, data, urb->actual_length);

 		/* Force the data to the tty layer. */
 		tty_flip_buffer_push(tty);
+		tty_kref_put(tty);
 	}
-	tty_kref_put(tty);

 	/* Set any port variables. */
 	spin_lock_irqsave(&metro_priv->lock, flags);

--
To unsubscribe from this list: send the line "unsubscribe linux-serial" in
the body of a message to majordomo <at> vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Gmane