From: Markus Elfring <Markus.Elfring@web.de>
To: netdev@vger.kernel.org, "David S. Miller" <davem@davemloft.net>,
Madalin Bucur <madalin.bucur@nxp.com>
Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org
Subject: [PATCH 3/3] fsl/fman: Return directly after a failed devm_kzalloc() in mac_probe()
Date: Sat, 9 Nov 2019 10:06:03 +0100 [thread overview]
Message-ID: <8ffc16a2-62cc-f948-e11b-55bae1d6aae4@web.de> (raw)
In-Reply-To: <132e8369-c4da-249f-76b8-834e394dc6d5@web.de>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 9 Nov 2019 09:26:12 +0100
Return directly after a call of the function “devm_kzalloc” failed
at the beginning.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/net/ethernet/freescale/fman/mac.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fman/mac.c b/drivers/net/ethernet/freescale/fman/mac.c
index 7fbd7cc24ede..75614e2ebda3 100644
--- a/drivers/net/ethernet/freescale/fman/mac.c
+++ b/drivers/net/ethernet/freescale/fman/mac.c
@@ -614,15 +614,12 @@ static int mac_probe(struct platform_device *_of_dev)
mac_node = dev->of_node;
mac_dev = devm_kzalloc(dev, sizeof(*mac_dev), GFP_KERNEL);
- if (!mac_dev) {
- err = -ENOMEM;
- goto _return;
- }
+ if (!mac_dev)
+ return -ENOMEM;
+
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
- if (!priv) {
- err = -ENOMEM;
- goto _return;
- }
+ if (!priv)
+ return -ENOMEM;
/* Save private information */
mac_dev->priv = priv;
--
2.24.0
prev parent reply other threads:[~2019-11-09 9:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-09 8:55 [PATCH 0/3] FMan MAC: Improve exception handling in mac_probe() Markus Elfring
2019-11-09 9:00 ` [PATCH 1/3] fsl/fman: Add missing put_device() calls " Markus Elfring
2019-11-10 9:15 ` Markus Elfring
2019-11-09 9:03 ` [PATCH 2/3] fsl/fman: Use common error handling code " Markus Elfring
2019-11-09 9:03 ` Markus Elfring
2019-11-09 9:06 ` Markus Elfring [this message]
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=8ffc16a2-62cc-f948-e11b-55bae1d6aae4@web.de \
--to=markus.elfring@web.de \
--cc=davem@davemloft.net \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=madalin.bucur@nxp.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).