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

Commit 301a29da authored by Nicolas Boullis's avatar Nicolas Boullis Committed by Greg Kroah-Hartman
Browse files

usb: acm: fix the computation of the number of data bits 



The current code assumes that CSIZE is 0000060, which appears to be
wrong on some arches (such as powerpc).

Signed-off-by: default avatarNicolas Boullis <nboullis@debian.org>
Acked-by: default avatarOliver Neukum <oneukum@suse.de>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6e1babb3

drivers/usb/class/cdc-acm.c

+15 −5
Original line number Diff line number Diff line
@@ -817,10 +817,6 @@ static const __u32 acm_tty_speed[] = { 
	2500000, 3000000, 3500000, 4000000

};



static const __u8 acm_tty_size[] = {

	5, 6, 7, 8

};



static void acm_tty_set_termios(struct tty_struct *tty,

						struct ktermios *termios_old)

{
@@ -834,7 +830,21 @@ static void acm_tty_set_termios(struct tty_struct *tty, 
	newline.bParityType = termios->c_cflag & PARENB ?

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

				(termios->c_cflag & CMSPAR ? 2 : 0) : 0;

	newline.bDataBits = acm_tty_size[(termios->c_cflag & CSIZE) >> 4];

	switch (termios->c_cflag & CSIZE) {

	case CS5:

		newline.bDataBits = 5;

		break;

	case CS6:

		newline.bDataBits = 6;

		break;

	case CS7:

		newline.bDataBits = 7;

		break;

	case CS8:

	default:

		newline.bDataBits = 8;

		break;

	}

	/* FIXME: Needs to clear unsupported bits in the termios */

	acm->clocal = ((termios->c_cflag & CLOCAL) != 0);