diff --git a/[refs] b/[refs]
index 70ac7951d058..3032ddc35466 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f90cfc505d613f4faf096e0d84ffe99208057d9
+refs/heads/master: 6a20bd45fda271bd57e3ba41b3de3009797f4b5e
diff --git a/trunk/drivers/net/wan/x25_asy.c b/trunk/drivers/net/wan/x25_asy.c
index d81ad8397885..66cda25aaa26 100644
--- a/trunk/drivers/net/wan/x25_asy.c
+++ b/trunk/drivers/net/wan/x25_asy.c
@@ -582,7 +582,7 @@ static int x25_asy_open_tty(struct tty_struct *tty)
 	if (err)
 		return err;
 	/* Done.  We have linked the TTY line to a channel. */
-	return sl->dev->base_addr;
+	return 0;
 }