lkml.org 
[lkml]   [2021]   [Jun]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 097/178] spi: spi-zynq-qspi: Fix some wrong goto jumps & missing error code
    Date
    From: zpershuai <zpershuai@gmail.com>

    [ Upstream commit f131767eefc47de2f8afb7950cdea78397997d66 ]

    In zynq_qspi_probe function, when enable the device clock is done,
    the return of all the functions should goto the clk_dis_all label.

    If num_cs is not right then this should return a negative error
    code but currently it returns success.

    Signed-off-by: zpershuai <zpershuai@gmail.com>
    Link: https://lore.kernel.org/r/1622110857-21812-1-git-send-email-zpershuai@gmail.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/spi/spi-zynq-qspi.c | 7 ++++---
    1 file changed, 4 insertions(+), 3 deletions(-)

    diff --git a/drivers/spi/spi-zynq-qspi.c b/drivers/spi/spi-zynq-qspi.c
    index 2765289028fa..68193db8b2e3 100644
    --- a/drivers/spi/spi-zynq-qspi.c
    +++ b/drivers/spi/spi-zynq-qspi.c
    @@ -678,14 +678,14 @@ static int zynq_qspi_probe(struct platform_device *pdev)
    xqspi->irq = platform_get_irq(pdev, 0);
    if (xqspi->irq <= 0) {
    ret = -ENXIO;
    - goto remove_master;
    + goto clk_dis_all;
    }
    ret = devm_request_irq(&pdev->dev, xqspi->irq, zynq_qspi_irq,
    0, pdev->name, xqspi);
    if (ret != 0) {
    ret = -ENXIO;
    dev_err(&pdev->dev, "request_irq failed\n");
    - goto remove_master;
    + goto clk_dis_all;
    }

    ret = of_property_read_u32(np, "num-cs",
    @@ -693,8 +693,9 @@ static int zynq_qspi_probe(struct platform_device *pdev)
    if (ret < 0) {
    ctlr->num_chipselect = 1;
    } else if (num_cs > ZYNQ_QSPI_MAX_NUM_CS) {
    + ret = -EINVAL;
    dev_err(&pdev->dev, "only 2 chip selects are available\n");
    - goto remove_master;
    + goto clk_dis_all;
    } else {
    ctlr->num_chipselect = num_cs;
    }
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-06-21 19:09    [W:4.023 / U:0.392 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site