projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
slip.c
diff --git
a/drivers/net/slip.c
b/drivers/net/slip.c
index 86718d3583950c1ace7ec74a23799b798f89c736..584809c656d5aaecda43d638fcaba1f48c929c89 100644
(file)
--- a/
drivers/net/slip.c
+++ b/
drivers/net/slip.c
@@
-856,7
+856,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);