From: Philipp Zabel <philipp.zabel@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: Ian Molton <spyro@f2s.com>,
Philipp Zabel <philipp.zabel@gmail.com>,
Pierre Ossman <pierre@ossman.eu>
Subject: [PATCH 4/5] mmc: tmio_mmc: correct probe return value for num_resources != 3
Date: Mon, 25 May 2009 21:28:00 +0200 [thread overview]
Message-ID: <1243279681-4233-5-git-send-email-philipp.zabel@gmail.com> (raw)
In-Reply-To: <1243279681-4233-1-git-send-email-philipp.zabel@gmail.com>
Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Cc: Pierre Ossman <pierre@ossman.eu>
Cc: Ian Molton <spyro@f2s.com>
---
drivers/mmc/host/tmio_mmc.c | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c
index 9a3dc54..b1b4e6c 100644
--- a/drivers/mmc/host/tmio_mmc.c
+++ b/drivers/mmc/host/tmio_mmc.c
@@ -521,23 +521,21 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev)
struct resource *res_ctl, *res_cnf;
struct tmio_mmc_host *host;
struct mmc_host *mmc;
- int ret = -ENOMEM;
+ int ret = -EINVAL;
if (dev->num_resources != 3)
goto out;
res_ctl = platform_get_resource(dev, IORESOURCE_MEM, 0);
res_cnf = platform_get_resource(dev, IORESOURCE_MEM, 1);
- if (!res_ctl || !res_cnf) {
- ret = -EINVAL;
+ if (!res_ctl || !res_cnf)
goto out;
- }
pdata = cell->driver_data;
- if (!pdata || !pdata->hclk) {
- ret = -EINVAL;
+ if (!pdata || !pdata->hclk)
goto out;
- }
+
+ ret = -ENOMEM;
mmc = mmc_alloc_host(sizeof(struct tmio_mmc_host), &dev->dev);
if (!mmc)
--
1.6.3.1
next prev parent reply other threads:[~2009-05-25 19:28 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-25 19:27 [PATCH 0/6] Preparations for ASIC3 support in the TMIO MMC driver Philipp Zabel
2009-05-25 19:27 ` [PATCH 1/5] MFD,mmc: tmio_mmc: make HCLK configurable Philipp Zabel
2009-05-29 11:20 ` Samuel Ortiz
2009-05-29 12:36 ` Pierre Ossman
2009-05-30 9:59 ` Ian molton
2009-05-30 11:40 ` pHilipp Zabel
2009-05-30 11:56 ` Ian Molton
2009-05-25 19:27 ` [PATCH 2/5] mmc: tmio_mmc: add bus_shift support Philipp Zabel
2009-05-26 20:16 ` pHilipp Zabel
2009-05-26 21:13 ` Ian molton
2009-05-30 10:36 ` Ian molton
2009-05-30 11:45 ` pHilipp Zabel
2009-05-30 10:26 ` Ian molton
2009-05-30 11:46 ` pHilipp Zabel
2009-06-03 20:28 ` Pierre Ossman
2009-05-25 19:27 ` [PATCH 3/5] mmc: tmio_mmc: don't use set_irq_type Philipp Zabel
2009-05-30 10:34 ` Ian molton
2009-06-03 20:29 ` Pierre Ossman
2009-05-25 19:28 ` Philipp Zabel [this message]
2009-05-30 11:28 ` [PATCH 4/5] mmc: tmio_mmc: correct probe return value for num_resources != 3 Ian molton
2009-05-25 19:28 ` [PATCH 5/5] mmc: tmio_mmc: move probe function into __init section Philipp Zabel
2009-05-27 20:21 ` Pierre Ossman
2009-05-30 11:36 ` Ian molton
2009-05-30 11:47 ` pHilipp Zabel
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=1243279681-4233-5-git-send-email-philipp.zabel@gmail.com \
--to=philipp.zabel@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pierre@ossman.eu \
--cc=spyro@f2s.com \
/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