Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b80fee1 authored by Alan Cox's avatar Alan Cox Committed by Live-CD User
Browse files

cdc_acm: Fix to use modern speed interfaces 



This changed in 2006 so its about time the ACM driver caught up

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b50989dc

drivers/usb/class/cdc-acm.c

+1 −4
Original line number Diff line number Diff line
@@ -858,10 +858,7 @@ static void acm_tty_set_termios(struct tty_struct *tty, 
	if (!ACM_READY(acm))

		return;



	/* FIXME: Needs to support the tty_baud interface */

	/* FIXME: Broken on sparc */

	newline.dwDTERate = cpu_to_le32p(acm_tty_speed +

		(termios->c_cflag & CBAUD & ~CBAUDEX) + (termios->c_cflag & CBAUDEX ? 15 : 0));

	newline.dwDTERate = cpu_to_le32(tty_get_baud_rate(tty));

	newline.bCharFormat = termios->c_cflag & CSTOPB ? 2 : 0;

	newline.bParityType = termios->c_cflag & PARENB ?

				(termios->c_cflag & PARODD ? 1 : 2) +