aboutsummaryrefslogtreecommitdiffstats
path: root/net/dsa
diff options
context:
space:
mode:
authorNeil Armstrong <narmstrong@baylibre.com>2015-10-06 15:39:53 +0100
committerDavid S. Miller <davem@davemloft.net>2015-10-07 04:56:06 -0700
commit1023d2ec1e8bd63ede9ed1d93ebb797f650859b7 (patch)
treef125e0da1f50d0b93857ae5517ca42bbd1754a29 /net/dsa
parentnet: Fix vti use case with oif in dst lookups for IPv6 (diff)
downloadlinux-dev-1023d2ec1e8bd63ede9ed1d93ebb797f650859b7.tar.xz
linux-dev-1023d2ec1e8bd63ede9ed1d93ebb797f650859b7.zip
net: dsa: add missing kfree on remove
To prevent memory leakage on unbinding, add missing kfree calls. Includes minor cosmetic change to make patch clean. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa')
-rw-r--r--net/dsa/dsa.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index c59fa5d9c22c..ed9d43fd1fec 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -914,8 +914,10 @@ static void dsa_remove_dst(struct dsa_switch_tree *dst)
for (i = 0; i < dst->pd->nr_chips; i++) {
struct dsa_switch *ds = dst->ds[i];
- if (ds != NULL)
+ if (ds) {
dsa_switch_destroy(ds);
+ kfree(ds);
+ }
}
}
@@ -924,6 +926,7 @@ static int dsa_remove(struct platform_device *pdev)
struct dsa_switch_tree *dst = platform_get_drvdata(pdev);
dsa_remove_dst(dst);
+ kfree(dst);
dsa_of_remove(&pdev->dev);
return 0;