---

yaml --- r: 102357 b: refs/heads/master c: 87c25ef h: refs/heads/master i: 102355: 441c1c0 v: v3
git-mirror · Jul 21, 2008 · 8391e81 · 8391e81
1 parent 62eaaa6
commit 8391e81
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f7a697a13a189a7ef43a9b6bfc3fc6e359d96fb
+refs/heads/master: 87c25ef0a41ad7a8249cd3009bf65deb700d4ee3
diff --git a/trunk/drivers/serial/pmac_zilog.c b/trunk/drivers/serial/pmac_zilog.c
@@ -242,12 +242,12 @@ static struct tty_struct *pmz_receive_chars(struct uart_pmac_port *uap)
 	}
 
 	/* Sanity check, make sure the old bug is no longer happening */
-	if (uap->port.info == NULL || uap->port.info->tty == NULL) {
+	if (uap->port.info == NULL || uap->port.info->port.tty == NULL) {
 		WARN_ON(1);
 		(void)read_zsdata(uap);
 		return NULL;
 	}
-	tty = uap->port.info->tty;
+	tty = uap->port.info->port.tty;
 
 	while (1) {
 		error = 0;