linux-next: build failure after merge of the usb tree

[Stephen Rothwell]

Hi Greg,

After merging the usb tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/usb/serial/vizzini.c: In function 'vizzini_set_termios':
drivers/usb/serial/vizzini.c:454:22: error: invalid type argument of '->' (have 'struct ktermios')

Caused by commit c05fecb1d57e ("USB: serial: add vizzini driver")
interacting with commit adc8d746caa6 ("tty: move the termios object into
the tty") from the tty tree.

I added the following merge fix patch and can carry it as necessary:

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Wed, 19 Sep 2012 14:27:39 +1000
Subject: [PATCH] USB: serial: fix vizzini driver for move of the termios
 object

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 drivers/usb/serial/vizzini.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/serial/vizzini.c b/drivers/usb/serial/vizzini.c
index 2ac48fe..253eaf8 100644
--- a/drivers/usb/serial/vizzini.c
+++ b/drivers/usb/serial/vizzini.c
@@ -451,7 +451,7 @@ static void vizzini_set_termios(struct tty_struct *tty_param,
 	unsigned int             format_size, format_parity, format_stop, flow, gpio_mode;
 	struct tty_struct       *tty = port->port.tty;
 
-	cflag = tty->termios->c_cflag;
+	cflag = tty->termios.c_cflag;
 
 	portdata->clocal = ((cflag & CLOCAL) != 0);
 
-- 
1.7.10.280.gaa39

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature