Skip to content

Commit

Permalink
tmio_mmc: correct probe return value for num_resources != 3
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Philipp Zabel authored and Pierre Ossman committed Jun 13, 2009
1 parent 6c413cc commit d6c9b5e
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions drivers/mmc/host/tmio_mmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit d6c9b5e

Please sign in to comment.