diff options
| author | Johan Hovold <johan@kernel.org> | 2016-11-08 13:10:57 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-10 13:12:59 +0100 |
| commit | 18266403f3fe507f0246faa1d5432333a2f139ca (patch) | |
| tree | 507a2e5434a7a1c7eaeac13517f8cd53d4fedc59 /drivers/usb/class | |
| parent | 7309aa847ead3fa561663b16779a0dde8c64cc7c (diff) | |
| download | linux-stable-18266403f3fe507f0246faa1d5432333a2f139ca.tar.gz linux-stable-18266403f3fe507f0246faa1d5432333a2f139ca.tar.bz2 linux-stable-18266403f3fe507f0246faa1d5432333a2f139ca.zip | |
USB: cdc-acm: fix TIOCMIWAIT
The TIOCMIWAIT implementation would return -EINVAL if any of the three
supported signals were included in the mask.
Instead of returning an error in case TIOCM_CTS is included, simply
drop the mask check completely, which is in accordance with how other
drivers implement this ioctl.
Fixes: 5a6a62bdb925 ("cdc-acm: add TIOCMIWAIT")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Acked-by: Oliver Neukum <oneukum@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/class')
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 4ad4ca44058b..fada988512a1 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -932,8 +932,6 @@ static int wait_serial_change(struct acm *acm, unsigned long arg) DECLARE_WAITQUEUE(wait, current); struct async_icount old, new; - if (arg & (TIOCM_DSR | TIOCM_RI | TIOCM_CD)) - return -EINVAL; do { spin_lock_irq(&acm->read_lock); old = acm->oldcount; |