lkml.org 
[lkml]   [2016]   [Sep]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.7 116/184] memory: omap-gpmc: allow probe of child nodes to fail
    Date
    4.7-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Johan Hovold <johan@kernel.org>

    commit 23540d6e2f3193b946c4de43e3f9654fa6d23fe7 upstream.

    A recent commit (inadvertently?) changed how failed probe of a gpmc
    child node was handled. Instead of proceeding with setting up any other
    children as before, a single error now aborts the whole process.

    This change broke networking on some Overo boards due to probe failing
    for an unrelated nand node. This second issue should obviously be
    fixed, but let's restore the old behaviour of allowing child-node
    probe to fail to avoid further similar breakage on other systems.

    Fixes: d2d00862dfbb ("memory: omap-gpmc: Support general purpose input
    for WAITPINs")
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Signed-off-by: Roger Quadros <rogerq@ti.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/memory/omap-gpmc.c | 21 +++++++--------------
    1 file changed, 7 insertions(+), 14 deletions(-)

    --- a/drivers/memory/omap-gpmc.c
    +++ b/drivers/memory/omap-gpmc.c
    @@ -2250,7 +2250,7 @@ static int gpmc_probe_dt(struct platform
    return 0;
    }

    -static int gpmc_probe_dt_children(struct platform_device *pdev)
    +static void gpmc_probe_dt_children(struct platform_device *pdev)
    {
    int ret;
    struct device_node *child;
    @@ -2265,11 +2265,11 @@ static int gpmc_probe_dt_children(struct
    else
    ret = gpmc_probe_generic_child(pdev, child);

    - if (ret)
    - return ret;
    + if (ret) {
    + dev_err(&pdev->dev, "failed to probe DT child '%s': %d\n",
    + child->name, ret);
    + }
    }
    -
    - return 0;
    }
    #else
    static int gpmc_probe_dt(struct platform_device *pdev)
    @@ -2277,9 +2277,8 @@ static int gpmc_probe_dt(struct platform
    return 0;
    }

    -static int gpmc_probe_dt_children(struct platform_device *pdev)
    +static void gpmc_probe_dt_children(struct platform_device *pdev)
    {
    - return 0;
    }
    #endif

    @@ -2372,16 +2371,10 @@ static int gpmc_probe(struct platform_de
    goto setup_irq_failed;
    }

    - rc = gpmc_probe_dt_children(pdev);
    - if (rc < 0) {
    - dev_err(gpmc->dev, "failed to probe DT children\n");
    - goto dt_children_failed;
    - }
    + gpmc_probe_dt_children(pdev);

    return 0;

    -dt_children_failed:
    - gpmc_free_irq(gpmc);
    setup_irq_failed:
    gpmc_gpio_exit(gpmc);
    gpio_init_failed:

    \
     
     \ /
      Last update: 2016-09-23 00:03    [W:4.131 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site