diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-12-10 07:28:43 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-12-10 07:28:43 -0800 |
| commit | a69ce65274ff1589bb64ea782a4178d7210da0bb (patch) | |
| tree | d039adba20838b165626987a5f63ff89c3e16338 /drivers/net/ppp/pppoe.c | |
| parent | caf91bc186175f0005ed77295f1acd52c6aeca47 (diff) | |
| parent | d235b7b42ab59e2e616082a0735b3bcc76685c7b (diff) | |
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-androidlsk-v3.10-16.01-androidlsk-v3.10-15.12-android
Diffstat (limited to 'drivers/net/ppp/pppoe.c')
| -rw-r--r-- | drivers/net/ppp/pppoe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c index eda9f3d87746..2840cf608312 100644 --- a/drivers/net/ppp/pppoe.c +++ b/drivers/net/ppp/pppoe.c @@ -569,7 +569,7 @@ static int pppoe_release(struct socket *sock) po = pppox_sk(sk); - if (sk->sk_state & (PPPOX_CONNECTED | PPPOX_BOUND | PPPOX_ZOMBIE)) { + if (po->pppoe_dev) { dev_put(po->pppoe_dev); po->pppoe_dev = NULL; } |