diff options
author | Flavio Leitner <fbl@conectiva.com.br> | 2005-04-18 20:39:31 -0400 |
---|---|---|
committer | Greg K-H <gregkh@suse.de> | 2005-04-18 20:39:31 -0400 |
commit | 6fdd8e8e33730a2abc886113bd0b6c4343f63cc9 (patch) | |
tree | 83b425282fb306a2b96520431867430233955385 /drivers/usb/serial/pl2303.c | |
parent | 8835f6657316162a8937d3f26ccd8f5886ba3845 (diff) |
[PATCH] pl2303 - unplug device.
It's possible to unplug usb device and do tiocmset() and tiocmget() without
valid interface in pl2303 module.
The patch below check this and return -ENODEV if interface was removed.
From: Flavio Leitner <fbl@conectiva.com.br>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff -purN linux-05-04-11/drivers/usb/serial/pl2303.c linux-05-04-11.usb/drivers/usb/serial/pl2303.c
Diffstat (limited to 'drivers/usb/serial/pl2303.c')
-rw-r--r-- | drivers/usb/serial/pl2303.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c index 3368d2b0412d..a52115407ea1 100644 --- a/drivers/usb/serial/pl2303.c +++ b/drivers/usb/serial/pl2303.c | |||
@@ -677,6 +677,9 @@ static int pl2303_tiocmset (struct usb_serial_port *port, struct file *file, | |||
677 | unsigned long flags; | 677 | unsigned long flags; |
678 | u8 control; | 678 | u8 control; |
679 | 679 | ||
680 | if (!usb_get_intfdata(port->serial->interface)) | ||
681 | return -ENODEV; | ||
682 | |||
680 | spin_lock_irqsave (&priv->lock, flags); | 683 | spin_lock_irqsave (&priv->lock, flags); |
681 | if (set & TIOCM_RTS) | 684 | if (set & TIOCM_RTS) |
682 | priv->line_control |= CONTROL_RTS; | 685 | priv->line_control |= CONTROL_RTS; |
@@ -702,6 +705,9 @@ static int pl2303_tiocmget (struct usb_serial_port *port, struct file *file) | |||
702 | 705 | ||
703 | dbg("%s (%d)", __FUNCTION__, port->number); | 706 | dbg("%s (%d)", __FUNCTION__, port->number); |
704 | 707 | ||
708 | if (!usb_get_intfdata(port->serial->interface)) | ||
709 | return -ENODEV; | ||
710 | |||
705 | spin_lock_irqsave (&priv->lock, flags); | 711 | spin_lock_irqsave (&priv->lock, flags); |
706 | mcr = priv->line_control; | 712 | mcr = priv->line_control; |
707 | status = priv->line_status; | 713 | status = priv->line_status; |