lkml.org 
[lkml]   [2021]   [Sep]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 095/162] fpga: machxo2-spi: Return an error on failure
    Date
    From: Tom Rix <trix@redhat.com>

    [ Upstream commit 34331739e19fd6a293d488add28832ad49c9fc54 ]

    Earlier successes leave 'ret' in a non error state, so these errors are
    not reported. Set ret to -EINVAL before going to the error handler.

    This addresses two issues reported by smatch:
    drivers/fpga/machxo2-spi.c:229 machxo2_write_init()
    warn: missing error code 'ret'

    drivers/fpga/machxo2-spi.c:316 machxo2_write_complete()
    warn: missing error code 'ret'

    [mdf@kernel.org: Reworded commit message]
    Fixes: 88fb3a002330 ("fpga: lattice machxo2: Add Lattice MachXO2 support")
    Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Tom Rix <trix@redhat.com>
    Signed-off-by: Moritz Fischer <mdf@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/fpga/machxo2-spi.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/fpga/machxo2-spi.c b/drivers/fpga/machxo2-spi.c
    index 1afb41aa20d7..b4a530a31302 100644
    --- a/drivers/fpga/machxo2-spi.c
    +++ b/drivers/fpga/machxo2-spi.c
    @@ -225,8 +225,10 @@ static int machxo2_write_init(struct fpga_manager *mgr,
    goto fail;

    get_status(spi, &status);
    - if (test_bit(FAIL, &status))
    + if (test_bit(FAIL, &status)) {
    + ret = -EINVAL;
    goto fail;
    + }
    dump_status_reg(&status);

    spi_message_init(&msg);
    @@ -313,6 +315,7 @@ static int machxo2_write_complete(struct fpga_manager *mgr,
    dump_status_reg(&status);
    if (!test_bit(DONE, &status)) {
    machxo2_cleanup(mgr);
    + ret = -EINVAL;
    goto fail;
    }

    --
    2.33.0


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