Browse Source

ttydev: fix pamc_zilog for tty pointer move

Today's linux-next build (sparc64 defconfig) failed like this:

drivers/serial/sunhv.c: In function `receive_chars':
drivers/serial/sunhv.c:188: error: structure has no member named `tty'
drivers/serial/sunsu.c: In function `receive_chars':
drivers/serial/sunsu.c:314: error: structure has no member named `tty'
drivers/serial/sunsab.c: In function `receive_chars':
drivers/serial/sunsab.c:121: error: structure has no member named `tty'

I applied the following patch (which, again, may not be correct).

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Stephen Rothwell 17 years ago
parent
commit
2f7a697a13
4 changed files with 5 additions and 5 deletions
  1. 1 1
      drivers/serial/sunhv.c
  2. 1 1
      drivers/serial/sunsab.c
  3. 1 1
      drivers/serial/sunsu.c
  4. 2 2
      drivers/serial/sunzilog.c

+ 1 - 1
drivers/serial/sunhv.c

@@ -185,7 +185,7 @@ static struct tty_struct *receive_chars(struct uart_port *port)
 	struct tty_struct *tty = NULL;
 	struct tty_struct *tty = NULL;
 
 
 	if (port->info != NULL)		/* Unopened serial console */
 	if (port->info != NULL)		/* Unopened serial console */
-		tty = port->info->tty;
+		tty = port->info->port.tty;
 
 
 	if (sunhv_ops->receive_chars(port, tty))
 	if (sunhv_ops->receive_chars(port, tty))
 		sun_do_break();
 		sun_do_break();

+ 1 - 1
drivers/serial/sunsab.c

@@ -118,7 +118,7 @@ receive_chars(struct uart_sunsab_port *up,
 	int i;
 	int i;
 
 
 	if (up->port.info != NULL)		/* Unopened serial console */
 	if (up->port.info != NULL)		/* Unopened serial console */
-		tty = up->port.info->tty;
+		tty = up->port.info->port.tty;
 
 
 	/* Read number of BYTES (Character + Status) available. */
 	/* Read number of BYTES (Character + Status) available. */
 	if (stat->sreg.isr0 & SAB82532_ISR0_RPF) {
 	if (stat->sreg.isr0 & SAB82532_ISR0_RPF) {

+ 1 - 1
drivers/serial/sunsu.c

@@ -311,7 +311,7 @@ static void sunsu_enable_ms(struct uart_port *port)
 static struct tty_struct *
 static struct tty_struct *
 receive_chars(struct uart_sunsu_port *up, unsigned char *status)
 receive_chars(struct uart_sunsu_port *up, unsigned char *status)
 {
 {
-	struct tty_struct *tty = up->port.info->tty;
+	struct tty_struct *tty = up->port.info->port.tty;
 	unsigned char ch, flag;
 	unsigned char ch, flag;
 	int max_count = 256;
 	int max_count = 256;
 	int saw_console_brk = 0;
 	int saw_console_brk = 0;

+ 2 - 2
drivers/serial/sunzilog.c

@@ -329,8 +329,8 @@ sunzilog_receive_chars(struct uart_sunzilog_port *up,
 
 
 	tty = NULL;
 	tty = NULL;
 	if (up->port.info != NULL &&		/* Unopened serial console */
 	if (up->port.info != NULL &&		/* Unopened serial console */
-	    up->port.info->tty != NULL)		/* Keyboard || mouse */
-		tty = up->port.info->tty;
+	    up->port.info->port.tty != NULL)	/* Keyboard || mouse */
+		tty = up->port.info->port.tty;
 
 
 	for (;;) {
 	for (;;) {