diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-16 16:54:22 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-20 20:12:36 -0400 |
commit | 87c25ef0a41ad7a8249cd3009bf65deb700d4ee3 (patch) | |
tree | 64f7760b1e42fe0cca0dcb766753d69a500c066e /drivers/serial/pmac_zilog.c | |
parent | 2f7a697a13a189a7ef43a9b6bfc3fc6e359d96fb (diff) |
ttydev: fix pamc_zilog for tty pointer move
Today's linux-next build (powerpc allyesconfig) failed like this:
drivers/serial/pmac_zilog.c: In function 'pmz_receive_chars':
drivers/serial/pmac_zilog.c:245: error: 'struct uart_info' has no member named 'tty'
drivers/serial/pmac_zilog.c:250: error: 'struct uart_info' has no member named 'tty'
I applied the patch below (which builds but may, or may not, be correct).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
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>
Diffstat (limited to 'drivers/serial/pmac_zilog.c')
-rw-r--r-- | drivers/serial/pmac_zilog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c index 794bd0f50d73..317b061f7641 100644 --- a/drivers/serial/pmac_zilog.c +++ b/drivers/serial/pmac_zilog.c | |||
@@ -242,12 +242,12 @@ static struct tty_struct *pmz_receive_chars(struct uart_pmac_port *uap) | |||
242 | } | 242 | } |
243 | 243 | ||
244 | /* Sanity check, make sure the old bug is no longer happening */ | 244 | /* Sanity check, make sure the old bug is no longer happening */ |
245 | if (uap->port.info == NULL || uap->port.info->tty == NULL) { | 245 | if (uap->port.info == NULL || uap->port.info->port.tty == NULL) { |
246 | WARN_ON(1); | 246 | WARN_ON(1); |
247 | (void)read_zsdata(uap); | 247 | (void)read_zsdata(uap); |
248 | return NULL; | 248 | return NULL; |
249 | } | 249 | } |
250 | tty = uap->port.info->tty; | 250 | tty = uap->port.info->port.tty; |
251 | 251 | ||
252 | while (1) { | 252 | while (1) { |
253 | error = 0; | 253 | error = 0; |