Commit 18266403 authored Nov 08, 2016 by Johan Hovold Committed by Greg Kroah-Hartman Nov 10, 2016

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: 5a6a62bd ("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>

parent 7309aa84

drivers/usb/class/cdc-acm.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -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;