aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <blino@mandriva.com>2008-08-08 15:01:11 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-08-14 04:43:45 -0400
commitadd477df674db00377d9a4dc0d9b553ce79bc06d (patch)
tree6b52bedf8a3c17ddb8259b717b68e6b6f759be2b
parent1595ab5d7d99bc6c9a5548ab3fb83e278eeae409 (diff)
hso: fix oops in read/write callbacks
The tty may be closed already when the read/write callbacks are called. This patch checks that the ttys still exist before waking them up. Signed-off-by: Olivier Blin <blino@mandriva.com> Acked-by: Alan Cox <alan@redhat.com> Cc: Jari Tenhunen <jari.tenhunen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
-rw-r--r--drivers/net/usb/hso.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 031d07b105af..94a27f764e6b 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -1467,7 +1467,8 @@ static void hso_std_serial_write_bulk_callback(struct urb *urb)
1467 return; 1467 return;
1468 } 1468 }
1469 hso_put_activity(serial->parent); 1469 hso_put_activity(serial->parent);
1470 tty_wakeup(serial->tty); 1470 if (serial->tty)
1471 tty_wakeup(serial->tty);
1471 hso_kick_transmit(serial); 1472 hso_kick_transmit(serial);
1472 1473
1473 D1(" "); 1474 D1(" ");
@@ -1538,7 +1539,8 @@ static void ctrl_callback(struct urb *urb)
1538 clear_bit(HSO_SERIAL_FLAG_RX_SENT, &serial->flags); 1539 clear_bit(HSO_SERIAL_FLAG_RX_SENT, &serial->flags);
1539 } else { 1540 } else {
1540 hso_put_activity(serial->parent); 1541 hso_put_activity(serial->parent);
1541 tty_wakeup(serial->tty); 1542 if (serial->tty)
1543 tty_wakeup(serial->tty);
1542 /* response to a write command */ 1544 /* response to a write command */
1543 hso_kick_transmit(serial); 1545 hso_kick_transmit(serial);
1544 } 1546 }