summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatvejchikov Ilya <matvejchikov@gmail.com>2011-05-06 06:23:09 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-21 15:13:16 -0700
commit1b0b0acbe1d20b296ba9a9cc5a9d9b877e4c6eb5 (patch)
tree4ccee3e11771b7b003935fecc2d4b84fafdc62bb
parent0249262d6296a5744ced1945c92dec7c2914a688 (diff)
NET: slip, fix ldisc->open retval
commit 057bef938896e6266ae24ec4266d24792d27c29a upstream. TTY layer expects 0 if the ldisc->open operation succeeded. Signed-off-by : Matvejchikov Ilya <matvejchikov@gmail.com> Acked-by: Oliver Hartkopp <socketcan@hartkopp.net> Acked-by: Alan Cox <alan@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/net/slip.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/slip.c b/drivers/net/slip.c
index 86cbb9ea2f26..8ec1a9a0bb9a 100644
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -853,7 +853,9 @@ static int slip_open(struct tty_struct *tty)
/* Done. We have linked the TTY line to a channel. */
rtnl_unlock();
tty->receive_room = 65536; /* We don't flow control */
- return sl->dev->base_addr;
+
+ /* TTY layer expects 0 on success */
+ return 0;
err_free_bufs:
sl_free_bufs(sl);