lkml.org 
[lkml]   [2018]   [Nov]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 075/114] spi/bcm63xx: fix error return code in bcm63xx_spi_probe()
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

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

    [ Upstream commit ba8afe94723e9ba665aee9cca649fb2c80f7304c ]

    platform_get_irq() returns an error code, but the spi-bcm63xx driver
    ignores it and always returns -ENXIO. This is not correct and,
    prevents -EPROBE_DEFER from being propagated properly.

    Notice that platform_get_irq() no longer returns 0 on error:
    https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e330b9a6bb35dc7097a4f02cb1ae7b6f96df92af

    Print and propagate the return value of platform_get_irq on failure.

    This issue was detected with the help of Coccinelle.

    Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/spi/spi-bcm63xx.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c
    index bf9a610e5b89..f14500910bc2 100644
    --- a/drivers/spi/spi-bcm63xx.c
    +++ b/drivers/spi/spi-bcm63xx.c
    @@ -496,8 +496,8 @@ static int bcm63xx_spi_probe(struct platform_device *pdev)

    irq = platform_get_irq(pdev, 0);
    if (irq < 0) {
    - dev_err(dev, "no irq\n");
    - return -ENXIO;
    + dev_err(dev, "no irq: %d\n", irq);
    + return irq;
    }

    clk = devm_clk_get(dev, "spi");
    --
    2.17.1


    \
     
     \ /
      Last update: 2018-11-08 23:29    [W:4.082 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site