lkml.org 
[lkml]   [2009]   [Jun]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/7] mmc: tmio_mmc: correct probe return value for num_resources != 3
    Date
    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


    \
     
     \ /
      Last update: 2009-06-04 20:17    [W:0.022 / U:33.044 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site