aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-06-13 11:37:32 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-06-13 11:37:32 +0000
commit3165ea7886d40115fc382c3271495abc67d12fed (patch)
treea4587be1aacf7a14a7687cf5c281045a024b58cd /target/linux
parent3c10fdc725b241a862d00f6842a3230bceaf8579 (diff)
downloadupstream-3165ea7886d40115fc382c3271495abc67d12fed.tar.gz
upstream-3165ea7886d40115fc382c3271495abc67d12fed.tar.bz2
upstream-3165ea7886d40115fc382c3271495abc67d12fed.zip
swconfig: release switch in error path of swconfig_get_attr
Signed-off-by: Karl Beldan <karl.beldan@sagemcom.com> SVN-Revision: 21779
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic-2.6/files/drivers/net/phy/swconfig.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/target/linux/generic-2.6/files/drivers/net/phy/swconfig.c b/target/linux/generic-2.6/files/drivers/net/phy/swconfig.c
index bda2e2d619..fa916982f0 100644
--- a/target/linux/generic-2.6/files/drivers/net/phy/swconfig.c
+++ b/target/linux/generic-2.6/files/drivers/net/phy/swconfig.c
@@ -688,7 +688,7 @@ swconfig_get_attr(struct sk_buff *skb, struct genl_info *info)
memset(&val, 0, sizeof(val));
attr = swconfig_lookup_attr(dev, info, &val);
if (!attr || !attr->get)
- goto error_dev;
+ goto error;
if (attr->type == SWITCH_TYPE_PORTS) {
val.value.ports = dev->portbuf;
@@ -737,9 +737,8 @@ swconfig_get_attr(struct sk_buff *skb, struct genl_info *info)
nla_put_failure:
if (msg)
nlmsg_free(msg);
-error_dev:
- swconfig_put_dev(dev);
error:
+ swconfig_put_dev(dev);
if (!err)
err = -ENOMEM;
return err;