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 tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
ppp
/
ppp_generic.c
diff --git
a/drivers/net/ppp/ppp_generic.c
b/drivers/net/ppp/ppp_generic.c
index ed00446759b2546d9026010d8b5148bc03ae2d95..9a863c6a6a33aa7883f6fa105fca917ae177e25c 100644
(file)
--- a/
drivers/net/ppp/ppp_generic.c
+++ b/
drivers/net/ppp/ppp_generic.c
@@
-721,10
+721,8
@@
static long ppp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
val &= 0xffff;
}
vj = slhc_init(val2+1, val+1);
- if (!vj) {
- netdev_err(ppp->dev,
- "PPP: no memory (VJ compressor)\n");
- err = -ENOMEM;
+ if (IS_ERR(vj)) {
+ err = PTR_ERR(vj);
break;
}
ppp_lock(ppp);