On Thu, Nov 07, 2013 at 09:12:09PM +0100, Colin Leitner wrote:
> This patch removes an erroneous check of CSIZE, making it impossible to set
> CS5.
Could you fix the subject-typo (s/settting/setting/) and perhaps also
rephrase the above sentence to something like:
"This patch removes an erroneous check of CSIZE, which made it
impossible to set CS5."
As this is actually two bug fixes that should also be backported to
stable, it's best to break it up into two separate patches.
> Compiles clean, but couldn't test against hardware.
I'll try to find time to test the mos7840 one tomorrow.
Thanks,
Johan
> Signed-off-by: Colin Leitner <colin.leitner@xxxxxxxxx>
> ---
> drivers/usb/serial/mos7840.c | 32 ++++++++++++++++----------------
> drivers/usb/serial/spcp8x5.c | 30 ++++++++++++++----------------
> 2 files changed, 30 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
> index e5bdd98..a69da83 100644
> --- a/drivers/usb/serial/mos7840.c
> +++ b/drivers/usb/serial/mos7840.c
> @@ -1813,25 +1813,25 @@ static void mos7840_change_port_settings(struct tty_struct *tty,
> iflag = tty->termios.c_iflag;
>
> /* Change the number of bits */
> - if (cflag & CSIZE) {
> - switch (cflag & CSIZE) {
> - case CS5:
> - lData = LCR_BITS_5;
> - break;
> + switch (cflag & CSIZE) {
> + case CS5:
> + lData = LCR_BITS_5;
> + break;
>
> - case CS6:
> - lData = LCR_BITS_6;
> - break;
> + case CS6:
> + lData = LCR_BITS_6;
> + break;
>
> - case CS7:
> - lData = LCR_BITS_7;
> - break;
> - default:
> - case CS8:
> - lData = LCR_BITS_8;
> - break;
> - }
> + case CS7:
> + lData = LCR_BITS_7;
> + break;
> +
> + default:
> + case CS8:
> + lData = LCR_BITS_8;
> + break;
> }
> +
> /* Change the Parity bit */
> if (cflag & PARENB) {
> if (cflag & PARODD) {
> diff --git a/drivers/usb/serial/spcp8x5.c b/drivers/usb/serial/spcp8x5.c
> index 4abac28..5b793c3 100644
> --- a/drivers/usb/serial/spcp8x5.c
> +++ b/drivers/usb/serial/spcp8x5.c
> @@ -348,22 +348,20 @@ static void spcp8x5_set_termios(struct tty_struct *tty,
> }
>
> /* Set Data Length : 00:5bit, 01:6bit, 10:7bit, 11:8bit */
> - if (cflag & CSIZE) {
> - switch (cflag & CSIZE) {
> - case CS5:
> - buf[1] |= SET_UART_FORMAT_SIZE_5;
> - break;
> - case CS6:
> - buf[1] |= SET_UART_FORMAT_SIZE_6;
> - break;
> - case CS7:
> - buf[1] |= SET_UART_FORMAT_SIZE_7;
> - break;
> - default:
> - case CS8:
> - buf[1] |= SET_UART_FORMAT_SIZE_8;
> - break;
> - }
> + switch (cflag & CSIZE) {
> + case CS5:
> + buf[1] |= SET_UART_FORMAT_SIZE_5;
> + break;
> + case CS6:
> + buf[1] |= SET_UART_FORMAT_SIZE_6;
> + break;
> + case CS7:
> + buf[1] |= SET_UART_FORMAT_SIZE_7;
> + break;
> + default:
> + case CS8:
> + buf[1] |= SET_UART_FORMAT_SIZE_8;
> + break;
> }
>
> /* Set Stop bit2 : 0:1bit 1:2bit */
> --
> 1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
