public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Philipp Zabel <philipp.zabel@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: Ian Molton <ian@mnementh.co.uk>, Pierre Ossman <pierre@ossman.eu>,
	Philipp Zabel <philipp.zabel@gmail.com>
Subject: [PATCH 4/7] mmc: tmio_mmc: correct probe return value for num_resources != 3
Date: Thu,  4 Jun 2009 20:12:34 +0200	[thread overview]
Message-ID: <1244139157-16404-5-git-send-email-philipp.zabel@gmail.com> (raw)
In-Reply-To: <1244139157-16404-1-git-send-email-philipp.zabel@gmail.com>

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Acked-by: Ian Molton <ian@mnementh.co.uk>
Cc: Pierre Ossman <pierre@ossman.eu>
---
 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 bbcbd72..b576640 100644
--- a/drivers/mmc/host/tmio_mmc.c
+++ b/drivers/mmc/host/tmio_mmc.c
@@ -522,23 +522,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


  parent reply	other threads:[~2009-06-04 18:13 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-04 18:12 [PATCH 0/7] ASIC3 support for tmio_mmc Philipp Zabel
2009-06-04 18:12 ` [PATCH 1/7] MFD,mmc: tmio_mmc: make HCLK configurable Philipp Zabel
2009-06-04 22:55   ` Samuel Ortiz
2009-06-04 18:12 ` [PATCH 2/7] mmc: tmio_mmc: add bus_shift support Philipp Zabel
2009-06-04 18:12 ` [PATCH 3/7] mmc: tmio_mmc: don't use set_irq_type (v2) Philipp Zabel
2009-06-04 18:12 ` Philipp Zabel [this message]
2009-06-04 18:12 ` [PATCH 5/7] mmc: tmio_mmc: map SD control registers after enabling the MFD cell Philipp Zabel
2009-06-12 21:36   ` Ian molton
2009-06-04 18:12 ` [PATCH 6/7] mmc: tmio_mmc: fix SDCLK divider setting Philipp Zabel
2009-06-12 21:44   ` Ian Molton
2009-06-04 18:12 ` [PATCH 7/7] mmc: tmio_mmc: allow compilation for ASIC3 Philipp Zabel
2009-06-12 21:47   ` Ian molton
2009-06-12 22:38     ` pHilipp Zabel
2009-06-13 11:58 ` [PATCH 0/7] ASIC3 support for tmio_mmc Pierre Ossman
2009-06-13 18:42   ` Ian Molton
2009-06-13 19:32     ` Pierre Ossman
2009-06-13 19:57       ` Ian Molton

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=1244139157-16404-5-git-send-email-philipp.zabel@gmail.com \
    --to=philipp.zabel@gmail.com \
    --cc=ian@mnementh.co.uk \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pierre@ossman.eu \
    /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