lkml.org 
[lkml]   [2012]   [Sep]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the usb tree with the tty tree
Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/serial/io_edgeport.c between commit adc8d746caa6 ("tty: move
the termios object into the tty") from the tty tree and commit
984f68683298 ("USB: serial: io_edgeport.c: remove dbg() usage") from the
usb tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc drivers/usb/serial/io_edgeport.c
index f435575,75b7ccd..0000000
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@@ -1516,13 -1497,9 +1497,9 @@@ static void edge_set_termios(struct tty
struct edgeport_port *edge_port = usb_get_serial_port_data(port);
unsigned int cflag;

- cflag = tty->termios->c_cflag;
- dev_dbg(&port->dev, "%s - clfag %08x iflag %08x\n", __func__, tty->termios->c_cflag, tty->termios->c_iflag);
+ cflag = tty->termios.c_cflag;
- dbg("%s - clfag %08x iflag %08x", __func__,
- tty->termios.c_cflag, tty->termios.c_iflag);
- dbg("%s - old clfag %08x old iflag %08x", __func__,
- old_termios->c_cflag, old_termios->c_iflag);
- dbg("%s - port %d", __func__, port->number);
++ dev_dbg(&port->dev, "%s - clfag %08x iflag %08x\n", __func__, tty->termios.c_cflag, tty->termios.c_iflag);
+ dev_dbg(&port->dev, "%s - old clfag %08x old iflag %08x\n", __func__, old_termios->c_cflag, old_termios->c_iflag);

if (edge_port == NULL)
return;
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-09-19 07:01    [W:0.027 / U:0.928 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site