Skip to content

Commit

Permalink
ttydev: fix pamc_zilog for tty pointer move
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Stephen Rothwell authored and Linus Torvalds committed Jul 21, 2008
1 parent 34492b5 commit 2f7a697
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion drivers/serial/sunhv.c
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ static struct tty_struct *receive_chars(struct uart_port *port)
struct tty_struct *tty = NULL;

if (port->info != NULL) /* Unopened serial console */
tty = port->info->tty;
tty = port->info->port.tty;

if (sunhv_ops->receive_chars(port, tty))
sun_do_break();
Expand Down
2 changes: 1 addition & 1 deletion drivers/serial/sunsab.c
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ receive_chars(struct uart_sunsab_port *up,
int i;

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. */
if (stat->sreg.isr0 & SAB82532_ISR0_RPF) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/serial/sunsu.c
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ static void sunsu_enable_ms(struct uart_port *port)
static struct tty_struct *
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;
int max_count = 256;
int saw_console_brk = 0;
Expand Down
4 changes: 2 additions & 2 deletions drivers/serial/sunzilog.c
Original file line number Diff line number Diff line change
Expand Up @@ -329,8 +329,8 @@ sunzilog_receive_chars(struct uart_sunzilog_port *up,

tty = NULL;
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 (;;) {

Expand Down

0 comments on commit 2f7a697

Please sign in to comment.