diff options
| author | Paul Bolle <pebolle@tiscali.nl> | 2009-01-14 14:41:00 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-14 14:41:00 -0800 |
| commit | bae584316045011ce3376816585a305d2b9b76f2 (patch) | |
| tree | 9d6dedb678562d0015a2947212cc6100a46b4819 | |
| parent | f0d44ae310bc8eb0b6694e257015d8b24e1a357c (diff) | |
| download | blackbird-obmc-linux-bae584316045011ce3376816585a305d2b9b76f2.tar.gz blackbird-obmc-linux-bae584316045011ce3376816585a305d2b9b76f2.zip | |
i4l: do not print a warning when shutting down an i4l ppp interface
When an i4l ppp interface is shut down (e.g. with /sbin/ifdown ippp0) a
scary warning is logged:
isdn_free_channel: called with invalid drv(-1) or channel(-1)
This warning is caused by isdn_net_unbind_channel(), which always calls
isdn_free_channel() even if isdn_net_local->isdn_device and
isdn_net_local->isdn_channel are (still) in a perfectly acceptable
default state, so let's not do that.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/isdn/i4l/isdn_net.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c index 7c5f97033b9f..de6be7181f07 100644 --- a/drivers/isdn/i4l/isdn_net.c +++ b/drivers/isdn/i4l/isdn_net.c @@ -292,7 +292,9 @@ isdn_net_unbind_channel(isdn_net_local * lp) lp->dialstate = 0; dev->rx_netdev[isdn_dc2minor(lp->isdn_device, lp->isdn_channel)] = NULL; dev->st_netdev[isdn_dc2minor(lp->isdn_device, lp->isdn_channel)] = NULL; - isdn_free_channel(lp->isdn_device, lp->isdn_channel, ISDN_USAGE_NET); + if (lp->isdn_device != -1 && lp->isdn_channel != -1) + isdn_free_channel(lp->isdn_device, lp->isdn_channel, + ISDN_USAGE_NET); lp->flags &= ~ISDN_NET_CONNECTED; lp->isdn_device = -1; lp->isdn_channel = -1; |
