From: Dan Carpenter <dan.carpenter@oracle.com>
To: David Woodhouse <dwmw2@infradead.org>
Cc: linux-mtd@lists.infradead.org, kernel-janitors@vger.kernel.org,
Robert Jarzmik <robert.jarzmik@free.fr>
Subject: [patch] mtd/docg3: fix error handling in docg3_probe()
Date: Thu, 24 Nov 2011 07:21:18 +0000 [thread overview]
Message-ID: <20111124072117.GC14122@elgon.mountain> (raw)
There was a kfree(docg3_floors); missing from the error handling
here. Also we set docg3_floors[floor] = mtd; when mtd was an ERR_PTR
and then we call doc_release_device() on it.
I reworked it a bit, so hopefully the code is more clear now.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/mtd/devices/docg3.c b/drivers/mtd/devices/docg3.c
index 27c4fea..bfc1ea1 100644
--- a/drivers/mtd/devices/docg3.c
+++ b/drivers/mtd/devices/docg3.c
@@ -1110,21 +1110,24 @@ static int __init docg3_probe(struct platform_device *pdev)
if (!docg3_floors)
goto nomem;
- ret = 0;
for (floor = 0; floor < DOC_MAX_NBFLOORS; floor++) {
mtd = doc_probe_device(base, floor, dev);
- if (floor = 0 && !mtd)
- goto notfound;
- if (!IS_ERR_OR_NULL(mtd))
- ret = mtd_device_parse_register(mtd, part_probes,
- NULL, NULL, 0);
- else
+ if (IS_ERR(mtd)) {
ret = PTR_ERR(mtd);
+ goto err_probe;
+ }
+ if (!mtd) {
+ if (floor = 0)
+ goto notfound;
+ else
+ continue;
+ }
docg3_floors[floor] = mtd;
+ ret = mtd_device_parse_register(mtd, part_probes, NULL, NULL,
+ 0);
if (ret)
goto err_probe;
- if (mtd)
- found++;
+ found++;
}
if (!found)
@@ -1138,9 +1141,11 @@ notfound:
ret = -ENODEV;
dev_info(dev, "No supported DiskOnChip found\n");
err_probe:
- for (floor = 0; floor < DOC_MAX_NBFLOORS; floor++)
+ for (floor = 0; floor < DOC_MAX_NBFLOORS; floor++) {
if (docg3_floors[floor])
doc_release_device(docg3_floors[floor]);
+ }
+ kfree(docg3_floors);
nomem:
iounmap(base);
noress:
WARNING: multiple messages have this Message-ID (diff)
From: Dan Carpenter <dan.carpenter@oracle.com>
To: David Woodhouse <dwmw2@infradead.org>
Cc: linux-mtd@lists.infradead.org, kernel-janitors@vger.kernel.org,
Robert Jarzmik <robert.jarzmik@free.fr>
Subject: [patch] mtd/docg3: fix error handling in docg3_probe()
Date: Thu, 24 Nov 2011 10:21:18 +0300 [thread overview]
Message-ID: <20111124072117.GC14122@elgon.mountain> (raw)
There was a kfree(docg3_floors); missing from the error handling
here. Also we set docg3_floors[floor] = mtd; when mtd was an ERR_PTR
and then we call doc_release_device() on it.
I reworked it a bit, so hopefully the code is more clear now.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/mtd/devices/docg3.c b/drivers/mtd/devices/docg3.c
index 27c4fea..bfc1ea1 100644
--- a/drivers/mtd/devices/docg3.c
+++ b/drivers/mtd/devices/docg3.c
@@ -1110,21 +1110,24 @@ static int __init docg3_probe(struct platform_device *pdev)
if (!docg3_floors)
goto nomem;
- ret = 0;
for (floor = 0; floor < DOC_MAX_NBFLOORS; floor++) {
mtd = doc_probe_device(base, floor, dev);
- if (floor == 0 && !mtd)
- goto notfound;
- if (!IS_ERR_OR_NULL(mtd))
- ret = mtd_device_parse_register(mtd, part_probes,
- NULL, NULL, 0);
- else
+ if (IS_ERR(mtd)) {
ret = PTR_ERR(mtd);
+ goto err_probe;
+ }
+ if (!mtd) {
+ if (floor == 0)
+ goto notfound;
+ else
+ continue;
+ }
docg3_floors[floor] = mtd;
+ ret = mtd_device_parse_register(mtd, part_probes, NULL, NULL,
+ 0);
if (ret)
goto err_probe;
- if (mtd)
- found++;
+ found++;
}
if (!found)
@@ -1138,9 +1141,11 @@ notfound:
ret = -ENODEV;
dev_info(dev, "No supported DiskOnChip found\n");
err_probe:
- for (floor = 0; floor < DOC_MAX_NBFLOORS; floor++)
+ for (floor = 0; floor < DOC_MAX_NBFLOORS; floor++) {
if (docg3_floors[floor])
doc_release_device(docg3_floors[floor]);
+ }
+ kfree(docg3_floors);
nomem:
iounmap(base);
noress:
next reply other threads:[~2011-11-24 7:21 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-24 7:21 Dan Carpenter [this message]
2011-11-24 7:21 ` [patch] mtd/docg3: fix error handling in docg3_probe() Dan Carpenter
2011-11-24 9:02 ` walter harms
2011-11-24 9:02 ` walter harms
2011-11-24 9:31 ` Dan Carpenter
2011-11-24 9:31 ` Dan Carpenter
2011-11-24 10:17 ` Robert Jarzmik
2011-11-24 10:17 ` Robert Jarzmik
2011-11-24 10:31 ` Dan Carpenter
2011-11-24 10:31 ` Dan Carpenter
2011-11-24 21:00 ` Robert Jarzmik
2011-11-24 21:08 ` Artem Bityutskiy
2011-11-24 21:29 ` Artem Bityutskiy
2011-11-26 10:58 ` Robert Jarzmik
2011-11-26 10:58 ` Robert Jarzmik
2011-11-28 13:53 ` [patch v2] mtd/docg3: dereferencing an ERR_PTR() " Dan Carpenter
2011-11-28 13:53 ` Dan Carpenter
2011-11-29 22:00 ` Robert Jarzmik
2011-11-29 22:00 ` Robert Jarzmik
2011-12-01 8:02 ` [patch v2] mtd/docg3: dereferencing an ERR_PTR() in Artem Bityutskiy
2011-12-01 8:02 ` [patch v2] mtd/docg3: dereferencing an ERR_PTR() in docg3_probe() Artem Bityutskiy
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=20111124072117.GC14122@elgon.mountain \
--to=dan.carpenter@oracle.com \
--cc=dwmw2@infradead.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=robert.jarzmik@free.fr \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.