diff options
| author | Mark Brown <broonie@kernel.org> | 2016-02-05 19:28:22 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-02-05 19:28:22 +0000 |
| commit | cd6f5814252060db2d38f57c602db33696c549c0 (patch) | |
| tree | 0bcf23a07f1316cb57f0127e5b1622fea59c3e8e /drivers/net/ppp/ppp_generic.c | |
| parent | d235b7b42ab59e2e616082a0735b3bcc76685c7b (diff) | |
| parent | e14ca734b547e3187713441909897aefdf4e4016 (diff) | |
Merge tag 'v3.10.96' into linux-linaro-lsk-v3.10lsk-v3.10-16.02
This is the 3.10.96 stable release
Diffstat (limited to 'drivers/net/ppp/ppp_generic.c')
| -rw-r--r-- | drivers/net/ppp/ppp_generic.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c index 5a1897d86e94..a2d7d5f066f1 100644 --- a/drivers/net/ppp/ppp_generic.c +++ b/drivers/net/ppp/ppp_generic.c @@ -716,10 +716,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); |