net: dsa: Add missing master netdev dev_put() calls

PATCH Superseded Neil Armstrong 1 participant 1 message Oct 29, 2015

Subsystems (3)

Networking Network drivers Networking DSA

lore

Share & tools

lore

Neil Armstrong

author

2015-10-29 13:23 UTC #0 lore raw

PATCH v2 4/6 net: dsa: Add missing master netdev dev_put() calls

Upon probe failure or unbinding, add missing dev_put() calls on master netdev.

Signed-off-by Neil Armstrong <[email protected]>

---
 net/dsa/dsa.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

net/dsa/dsa.c +5 -1

index b2f696c..597a462 100644
@@ -928,8 +928,10 @@ static int dsa_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, dst);
 
 	ret = dsa_setup_dst(dst, dev, &pdev->dev, pd);
-	if (ret)
+	if (ret) {
+		dev_put(dev);
 		goto out;
+	}
 
 	return 0;

@@ -963,6 +965,8 @@ static void dsa_remove_dst(struct dsa_switch_tree *dst)
 		if (ds)
 			dsa_switch_destroy(ds);
 	}
+
+	dev_put(dst->master_netdev);
 }
 
 static int dsa_remove(struct platform_device *pdev)

Signature · 1 line

1.9.1