From: Neil Armstrong <narmstrong@baylibre•com>
To: "David S. Miller" <davem@davemloft•net>
Cc: Andrew Lunn <andrew@lunn•ch>,
Florian Fainelli <f.fainelli@gmail•com>,
Guenter Roeck <linux@roeck-us•net>,
vivien.didelot@savoirfairelinux•com,
Fabian Frederick <fabf@skynet•be>,
Pavel Nakonechny <pavel.nakonechny@skitlab•ru>,
Joe Perches <joe@perches•com>,
netdev@vger•kernel.org, linux-kernel@vger•kernel.org,
Frode Isaksen <fisaksen@baylibre•com>
Subject: [PATCH 4/6] net: dsa: Add missing master netdev dev_put() calls
Date: Tue, 27 Oct 2015 15:49:09 +0100 [thread overview]
Message-ID: <562F8EE5.6070907@baylibre.com> (raw)
Upon probe failure or unbinding, add missing dev_put() calls.
Signed-off-by: Neil Armstrong <narmstrong@baylibre•com>
---
net/dsa/dsa.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index acbf854..9240a46 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -931,8 +931,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;
@@ -965,6 +967,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)
--
1.9.1
reply other threads:[~2015-10-27 14:49 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=562F8EE5.6070907@baylibre.com \
--to=narmstrong@baylibre$(echo .)com \
--cc=andrew@lunn$(echo .)ch \
--cc=davem@davemloft$(echo .)net \
--cc=f.fainelli@gmail$(echo .)com \
--cc=fabf@skynet$(echo .)be \
--cc=fisaksen@baylibre$(echo .)com \
--cc=joe@perches$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux@roeck-us$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pavel.nakonechny@skitlab$(echo .)ru \
--cc=vivien.didelot@savoirfairelinux$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox