lkml.org 
[lkml]   [2012]   [Jul]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subjectlinux-next: build failure after merge of the final tree (tty tree related)
    Hi all,

    After merging the final tree, today's linux-next build (powerpc
    allyesconfig) failed like this:

    drivers/usb/serial/console.c: In function 'usb_console_setup':
    drivers/usb/serial/console.c:168:16: error: invalid type argument of '->' (have 'struct ktermios')
    drivers/usb/serial/console.c:169:4: error: incompatible type for argument 1 of 'tty_termios_encode_baud_rate'
    include/linux/tty.h:449:13: note: expected 'struct ktermios *' but argument is of type 'struct ktermios'

    Caused by commit adc8d746caa6 ("tty: move the termios object into the
    tty"). Hopefully this is the last of them.

    I have added the following fix patch for today:

    From: Stephen Rothwell <sfr@canb.auug.org.au>
    Date: Fri, 20 Jul 2012 14:58:31 +1000
    Subject: [PATCH] tty: fix up usb serial console for termios change.

    fixes these errors:

    drivers/usb/serial/console.c: In function 'usb_console_setup':
    drivers/usb/serial/console.c:168:16: error: invalid type argument of '->' (have 'struct ktermios')
    drivers/usb/serial/console.c:169:4: error: incompatible type for argument 1 of 'tty_termios_encode_baud_rate'
    include/linux/tty.h:449:13: note: expected 'struct ktermios *' but argument is of type 'struct ktermios'

    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    ---
    drivers/usb/serial/console.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
    index b9cca6d..9a56428 100644
    --- a/drivers/usb/serial/console.c
    +++ b/drivers/usb/serial/console.c
    @@ -165,8 +165,8 @@ static int usb_console_setup(struct console *co, char *options)
    }

    if (serial->type->set_termios) {
    - tty->termios->c_cflag = cflag;
    - tty_termios_encode_baud_rate(tty->termios, baud, baud);
    + tty->termios.c_cflag = cflag;
    + tty_termios_encode_baud_rate(&tty->termios, baud, baud);
    memset(&dummy, 0, sizeof(struct ktermios));
    serial->type->set_termios(tty, port, &dummy);

    --
    1.7.10.280.gaa39
    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2012-07-20 07:41    [W:0.038 / U:120.856 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site