diff options
-rw-r--r-- | drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/marvell/mv643xx_eth.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/ti/netcp_ethss.c | 8 | ||||
-rw-r--r-- | drivers/net/phy/mdio-mux-mmioreg.c | 2 | ||||
-rw-r--r-- | drivers/net/phy/mdio-mux.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/init.c | 1 |
6 files changed, 16 insertions, 4 deletions
diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c index 574c49278900..180aa9fabf48 100644 --- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c +++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c | |||
@@ -977,8 +977,10 @@ static int bgx_init_of_phy(struct bgx *bgx) | |||
977 | SET_NETDEV_DEV(&bgx->lmac[lmac].netdev, &bgx->pdev->dev); | 977 | SET_NETDEV_DEV(&bgx->lmac[lmac].netdev, &bgx->pdev->dev); |
978 | bgx->lmac[lmac].lmacid = lmac; | 978 | bgx->lmac[lmac].lmacid = lmac; |
979 | lmac++; | 979 | lmac++; |
980 | if (lmac == MAX_LMAC_PER_BGX) | 980 | if (lmac == MAX_LMAC_PER_BGX) { |
981 | of_node_put(np_child); | ||
981 | break; | 982 | break; |
983 | } | ||
982 | } | 984 | } |
983 | return 0; | 985 | return 0; |
984 | } | 986 | } |
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c index e893a35143c5..dfb6d5f79a10 100644 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c | |||
@@ -2817,8 +2817,10 @@ static int mv643xx_eth_shared_of_probe(struct platform_device *pdev) | |||
2817 | 2817 | ||
2818 | for_each_available_child_of_node(np, pnp) { | 2818 | for_each_available_child_of_node(np, pnp) { |
2819 | ret = mv643xx_eth_shared_of_add_port(pdev, pnp); | 2819 | ret = mv643xx_eth_shared_of_add_port(pdev, pnp); |
2820 | if (ret) | 2820 | if (ret) { |
2821 | of_node_put(pnp); | ||
2821 | return ret; | 2822 | return ret; |
2823 | } | ||
2822 | } | 2824 | } |
2823 | return 0; | 2825 | return 0; |
2824 | } | 2826 | } |
diff --git a/drivers/net/ethernet/ti/netcp_ethss.c b/drivers/net/ethernet/ti/netcp_ethss.c index 6bff8d82ceab..4e70e7586a09 100644 --- a/drivers/net/ethernet/ti/netcp_ethss.c +++ b/drivers/net/ethernet/ti/netcp_ethss.c | |||
@@ -2637,8 +2637,10 @@ static void init_secondary_ports(struct gbe_priv *gbe_dev, | |||
2637 | mac_phy_link = true; | 2637 | mac_phy_link = true; |
2638 | 2638 | ||
2639 | slave->open = true; | 2639 | slave->open = true; |
2640 | if (gbe_dev->num_slaves >= gbe_dev->max_num_slaves) | 2640 | if (gbe_dev->num_slaves >= gbe_dev->max_num_slaves) { |
2641 | of_node_put(port); | ||
2641 | break; | 2642 | break; |
2643 | } | ||
2642 | } | 2644 | } |
2643 | 2645 | ||
2644 | /* of_phy_connect() is needed only for MAC-PHY interface */ | 2646 | /* of_phy_connect() is needed only for MAC-PHY interface */ |
@@ -3137,8 +3139,10 @@ static int gbe_probe(struct netcp_device *netcp_device, struct device *dev, | |||
3137 | continue; | 3139 | continue; |
3138 | } | 3140 | } |
3139 | gbe_dev->num_slaves++; | 3141 | gbe_dev->num_slaves++; |
3140 | if (gbe_dev->num_slaves >= gbe_dev->max_num_slaves) | 3142 | if (gbe_dev->num_slaves >= gbe_dev->max_num_slaves) { |
3143 | of_node_put(interface); | ||
3141 | break; | 3144 | break; |
3145 | } | ||
3142 | } | 3146 | } |
3143 | of_node_put(interfaces); | 3147 | of_node_put(interfaces); |
3144 | 3148 | ||
diff --git a/drivers/net/phy/mdio-mux-mmioreg.c b/drivers/net/phy/mdio-mux-mmioreg.c index 2377c1341172..7fde454fbc4f 100644 --- a/drivers/net/phy/mdio-mux-mmioreg.c +++ b/drivers/net/phy/mdio-mux-mmioreg.c | |||
@@ -113,12 +113,14 @@ static int mdio_mux_mmioreg_probe(struct platform_device *pdev) | |||
113 | if (!iprop || len != sizeof(uint32_t)) { | 113 | if (!iprop || len != sizeof(uint32_t)) { |
114 | dev_err(&pdev->dev, "mdio-mux child node %s is " | 114 | dev_err(&pdev->dev, "mdio-mux child node %s is " |
115 | "missing a 'reg' property\n", np2->full_name); | 115 | "missing a 'reg' property\n", np2->full_name); |
116 | of_node_put(np2); | ||
116 | return -ENODEV; | 117 | return -ENODEV; |
117 | } | 118 | } |
118 | if (be32_to_cpup(iprop) & ~s->mask) { | 119 | if (be32_to_cpup(iprop) & ~s->mask) { |
119 | dev_err(&pdev->dev, "mdio-mux child node %s has " | 120 | dev_err(&pdev->dev, "mdio-mux child node %s has " |
120 | "a 'reg' value with unmasked bits\n", | 121 | "a 'reg' value with unmasked bits\n", |
121 | np2->full_name); | 122 | np2->full_name); |
123 | of_node_put(np2); | ||
122 | return -ENODEV; | 124 | return -ENODEV; |
123 | } | 125 | } |
124 | } | 126 | } |
diff --git a/drivers/net/phy/mdio-mux.c b/drivers/net/phy/mdio-mux.c index 280c7c311f72..908e8d486342 100644 --- a/drivers/net/phy/mdio-mux.c +++ b/drivers/net/phy/mdio-mux.c | |||
@@ -144,6 +144,7 @@ int mdio_mux_init(struct device *dev, | |||
144 | dev_err(dev, | 144 | dev_err(dev, |
145 | "Error: Failed to allocate memory for child\n"); | 145 | "Error: Failed to allocate memory for child\n"); |
146 | ret_val = -ENOMEM; | 146 | ret_val = -ENOMEM; |
147 | of_node_put(child_bus_node); | ||
147 | break; | 148 | break; |
148 | } | 149 | } |
149 | cb->bus_number = v; | 150 | cb->bus_number = v; |
diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c index 6e473fa4b13c..12241b1c57cd 100644 --- a/drivers/net/wireless/ath/ath6kl/init.c +++ b/drivers/net/wireless/ath/ath6kl/init.c | |||
@@ -715,6 +715,7 @@ static bool check_device_tree(struct ath6kl *ar) | |||
715 | board_filename, ret); | 715 | board_filename, ret); |
716 | continue; | 716 | continue; |
717 | } | 717 | } |
718 | of_node_put(node); | ||
718 | return true; | 719 | return true; |
719 | } | 720 | } |
720 | return false; | 721 | return false; |