From: nizamhaider786@gmail.com
To: lkundrak@v3.sk
Cc: arnd@arndb.de, gregkh@linuxfoundation.org,
linux-kernel@vger.kernel.org,
Nijam Haider <nizamhaider786@gmail.com>
Subject: [PATCH V4] char: pcmcia: scr24x_cs: Fix failure handling of device_create()
Date: Fri, 28 May 2021 01:04:29 +0530 [thread overview]
Message-ID: <20210527193429.696-1-nizamhaider786@gmail.com> (raw)
From: Nijam Haider <nizamhaider786@gmail.com>
Ignored error in device_create() and pcmcia_enable_device()
this patch implements proper error handling.
Signed-off-by: Nijam Haider <nizamhaider786@gmail.com>
---
V3 -> V4: Added label and moved the cleanup code
V2 -> V3: Added description, Changelog and removed whitespace error
V1 -> V2: Split the patch into two parts and addressed review comments
---
drivers/char/pcmcia/scr24x_cs.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/drivers/char/pcmcia/scr24x_cs.c b/drivers/char/pcmcia/scr24x_cs.c
index 47feb39af34c..ba84b4dd13d3 100644
--- a/drivers/char/pcmcia/scr24x_cs.c
+++ b/drivers/char/pcmcia/scr24x_cs.c
@@ -233,6 +233,7 @@ static int scr24x_probe(struct pcmcia_device *link)
{
struct scr24x_dev *dev;
int ret;
+ struct device *dev_ret;
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
if (!dev)
@@ -271,22 +272,28 @@ static int scr24x_probe(struct pcmcia_device *link)
goto err;
ret = pcmcia_enable_device(link);
- if (ret < 0) {
- pcmcia_disable_device(link);
- goto err;
- }
+ if (ret < 0)
+ goto err_device;
- device_create(scr24x_class, NULL, MKDEV(MAJOR(scr24x_devt), dev->devno),
+ dev_ret = device_create(scr24x_class, NULL, MKDEV(MAJOR(scr24x_devt), dev->devno),
NULL, "scr24x%d", dev->devno);
+ if (IS_ERR(dev_ret)) {
+ dev_err(&link->dev, "device_create failed for %d\n",
+ dev->devno);
+ goto err_device;
+ }
dev_info(&link->dev, "SCR24x Chip Card Interface\n");
return 0;
+err_device:
+ pcmcia_disable_device(link);
+ cdev_del(&dev->c_dev);
err:
if (dev->devno < SCR24X_DEVS)
clear_bit(dev->devno, scr24x_minors);
kfree (dev);
- return ret;
+ return -ENODEV;
}
static void scr24x_remove(struct pcmcia_device *link)
--
2.17.1
next reply other threads:[~2021-05-27 19:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-27 19:34 nizamhaider786 [this message]
2021-05-28 7:26 ` [PATCH V4] char: pcmcia: scr24x_cs: Fix failure handling of device_create() Lubomir Rintel
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=20210527193429.696-1-nizamhaider786@gmail.com \
--to=nizamhaider786@gmail.com \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lkundrak@v3.sk \
/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).