diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-04 20:57:25 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-04 20:57:25 +0100 |
| commit | dbbe68bb12b34f3e450da7a73c20e6fa1f85d63a (patch) | |
| tree | 10f8363cbf5e428c0cb5614959e37b67a7e0cfa2 /drivers/atm | |
| parent | net: typos in comments in include/linux/igmp.h (diff) | |
| parent | ipv4/route.c: respect prefsrc for local routes (diff) | |
| download | linux-dbbe68bb12b34f3e450da7a73c20e6fa1f85d63a.tar.xz linux-dbbe68bb12b34f3e450da7a73c20e6fa1f85d63a.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/atm')
| -rw-r--r-- | drivers/atm/atmtcp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c index 2b464b631f22..0b0625054a87 100644 --- a/drivers/atm/atmtcp.c +++ b/drivers/atm/atmtcp.c @@ -392,7 +392,10 @@ static int atmtcp_attach(struct atm_vcc *vcc,int itf) atm_dev_put(dev); return -EMEDIUMTYPE; } - if (PRIV(dev)->vcc) return -EBUSY; + if (PRIV(dev)->vcc) { + atm_dev_put(dev); + return -EBUSY; + } } else { int error; |