aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-02-05 08:39:24 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-02-05 08:39:24 +0000
commit708c4a4f33159e24e6da403bbd7c5a685dda211d (patch)
treee09103b31d6bf6d586682c10cbfc3a1e64c4e9e9
parent81da03e0d1b6a4b8301178bba0e62ae2ba75eb91 (diff)
downloadupstream-708c4a4f33159e24e6da403bbd7c5a685dda211d.tar.gz
upstream-708c4a4f33159e24e6da403bbd7c5a685dda211d.tar.bz2
upstream-708c4a4f33159e24e6da403bbd7c5a685dda211d.zip
generic: ar8216: unregister switch on error path
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35496 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/generic/files/drivers/net/phy/ar8216.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/target/linux/generic/files/drivers/net/phy/ar8216.c b/target/linux/generic/files/drivers/net/phy/ar8216.c
index b274b13662..3a0483ddba 100644
--- a/target/linux/generic/files/drivers/net/phy/ar8216.c
+++ b/target/linux/generic/files/drivers/net/phy/ar8216.c
@@ -1125,7 +1125,7 @@ ar8327_init_port(struct ar8216_priv *priv, int port)
cfg = NULL;
ar8327_config_port(priv, port, cfg);
-
+
priv->write(priv, AR8327_REG_PORT_HEADER(port), 0);
t = 1 << AR8327_PORT_VLAN0_DEF_SVID_S;
@@ -1864,7 +1864,7 @@ ar8216_config_init(struct phy_device *pdev)
if (ret)
goto err_free_priv;
- ret = register_switch(&priv->dev, pdev->attached_dev);
+ ret = register_switch(swdev, pdev->attached_dev);
if (ret)
goto err_cleanup_mib;
@@ -1875,11 +1875,11 @@ ar8216_config_init(struct phy_device *pdev)
ret = priv->chip->hw_init(priv);
if (ret)
- goto err_cleanup_mib;
+ goto err_unregister_switch;
ret = ar8216_sw_reset_switch(&priv->dev);
if (ret)
- goto err_cleanup_mib;
+ goto err_unregister_switch;
dev->phy_ptr = priv;
@@ -1896,6 +1896,8 @@ ar8216_config_init(struct phy_device *pdev)
return 0;
+err_unregister_switch:
+ unregister_switch(&priv->dev);
err_cleanup_mib:
ar8xxx_mib_cleanup(priv);
err_free_priv: