lkml.org 
[lkml]   [2020]   [Jul]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 134/244] mtd: rawnand: marvell: Fix the condition on a return code
    Date
    From: Miquel Raynal <miquel.raynal@bootlin.com>

    commit c27075772d1f1c8aaf276db9943b35adda8a8b65 upstream.

    In a previous fix, I changed the condition on which the timeout of an
    IRQ is reached from:

    if (!ret)

    into:

    if (ret && !pending)

    While having a non-zero return code is usual in the Linux kernel, here
    ret comes from a wait_for_completion_timeout() which returns 0 when
    the waiting period is too long.

    Hence, the revised condition should be:

    if (!ret && !pending)

    The faulty patch did not produce any error because of the !pending
    condition so this change is finally purely cosmetic and does not
    change the actual driver behavior.

    Fixes: cafb56dd741e ("mtd: rawnand: marvell: prevent timeouts on a loaded machine")
    Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
    Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
    Link: https://lore.kernel.org/linux-mtd/20200424164501.26719-2-miquel.raynal@bootlin.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/mtd/nand/raw/marvell_nand.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/mtd/nand/raw/marvell_nand.c
    +++ b/drivers/mtd/nand/raw/marvell_nand.c
    @@ -707,7 +707,7 @@ static int marvell_nfc_wait_op(struct na
    * In case the interrupt was not served in the required time frame,
    * check if the ISR was not served or if something went actually wrong.
    */
    - if (ret && !pending) {
    + if (!ret && !pending) {
    dev_err(nfc->dev, "Timeout waiting for RB signal\n");
    return -ETIMEDOUT;
    }

    \
     
     \ /
      Last update: 2020-07-20 18:12    [W:4.144 / U:0.260 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site