diff options
| author | Philipp Zabel <philipp.zabel@gmail.com> | 2009-06-04 20:12:34 +0200 |
|---|---|---|
| committer | Pierre Ossman <pierre@ossman.eu> | 2009-06-13 22:43:00 +0200 |
| commit | d6c9b5ed37c26503795d241474a17db1d306e7ea (patch) | |
| tree | f85538919e7f2acaa3bf187249fd5542c2f95d3b /drivers/mmc | |
| parent | 6c413cc76b893310b3b258b7de47fb74dcc50203 (diff) | |
| download | kernel-crypto-d6c9b5ed37c26503795d241474a17db1d306e7ea.tar.gz kernel-crypto-d6c9b5ed37c26503795d241474a17db1d306e7ea.tar.xz kernel-crypto-d6c9b5ed37c26503795d241474a17db1d306e7ea.zip | |
tmio_mmc: correct probe return value for num_resources != 3
Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Acked-by: Ian Molton <ian@mnementh.co.uk>
Signed-off-by: Pierre Ossman <pierre@ossman.eu>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | 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 bbcbd72a46a..b5766407048 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) |