Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-17 08:31:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

USB: ark3116: switch to generic TIOCMIWAIT implementation

Browse Source 
Switch to the generic TIOCMIWAIT implementation which does not suffer
from the races involved when using the deprecated sleep_on functions.

This also fixes the issue with processes waiting for
modem-status-changes not being woken up at disconnect.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johan Hovold 2013-03-21 12:36:59 +01:00 committed by Greg Kroah-Hartman
parent b4cb7536cc
commit 7caed7e78c
1 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/usb/serial/ark3116.c
View File

@ -426,33 +426,6 @@ static int ark3116_ioctl(struct tty_struct *tty,
if (copy_from_user(&serstruct, user_arg, sizeof(serstruct))) if (copy_from_user(&serstruct, user_arg, sizeof(serstruct)))
return -EFAULT; return -EFAULT;
return 0; return 0;
case TIOCMIWAIT:
for (;;) {
struct async_icount prev = port->icount;
interruptible_sleep_on(&port->delta_msr_wait);
/* see if a signal did it */
if (signal_pending(current))
return -ERESTARTSYS;
if (port->serial->disconnected)
return -EIO;
if ((prev.rng == port->icount.rng) &&
(prev.dsr == port->icount.dsr) &&
(prev.dcd == port->icount.dcd) &&
(prev.cts == port->icount.cts))
return -EIO;
if ((arg & TIOCM_RNG &&
(prev.rng != port->icount.rng)) ||
(arg & TIOCM_DSR &&
(prev.dsr != port->icount.dsr)) ||
(arg & TIOCM_CD &&
(prev.dcd != port->icount.dcd)) ||
(arg & TIOCM_CTS &&
(prev.cts != port->icount.cts)))
return 0;
}
break;
} }
return -ENOIOCTLCMD; return -ENOIOCTLCMD;
@ -557,7 +530,7 @@ static void ark3116_update_msr(struct usb_serial_port *port, __u8 msr)
port->icount.dcd++; port->icount.dcd++;
if (msr & UART_MSR_TERI) if (msr & UART_MSR_TERI)
port->icount.rng++; port->icount.rng++;
wake_up_interruptible(&port->delta_msr_wait); wake_up_interruptible(&port->port.delta_msr_wait);
} }
} }
@ -697,6 +670,7 @@ static struct usb_serial_driver ark3116_device = {
.ioctl = ark3116_ioctl, .ioctl = ark3116_ioctl,
.tiocmget = ark3116_tiocmget, .tiocmget = ark3116_tiocmget,
.tiocmset = ark3116_tiocmset, .tiocmset = ark3116_tiocmset,
.tiocmiwait = usb_serial_generic_tiocmiwait,
.get_icount = usb_serial_generic_get_icount, .get_icount = usb_serial_generic_get_icount,
.open = ark3116_open, .open = ark3116_open,
.close = ark3116_close, .close = ark3116_close,