]> git.karo-electronics.de Git - linux-beck.git/commitdiff
cxlflash: Fix to double the delay each time
authorManoj Kumar <manoj@linux.vnet.ibm.com>
Wed, 21 Oct 2015 20:15:30 +0000 (15:15 -0500)
committerJames Bottomley <JBottomley@Odin.com>
Fri, 30 Oct 2015 08:19:35 +0000 (17:19 +0900)
The operator used to double the master context response delay
is incorrect and does not result in delay doubling.

To fix, use a left shift instead of the XOR operator.

Reported-by: Tomas Henzl <thenzl@redhat.com>
Signed-off-by: Matthew R. Ochs <mrochs@linux.vnet.ibm.com>
Signed-off-by: Manoj N. Kumar <manoj@linux.vnet.ibm.com>
Reviewed-by: Brian King <brking@linux.vnet.ibm.com>
Reviewed-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
drivers/scsi/cxlflash/main.c

index c77cb929dacb7d35d470cea16c210ff6d600f29e..51883bef844476793fa1bb978ef1453e9c4843d1 100644 (file)
@@ -303,7 +303,7 @@ write_rrin:
                if (rrin != 0x1)
                        break;
                /* Double delay each time */
-               udelay(2 ^ nretry);
+               udelay(2 << nretry);
        } while (nretry++ < MC_ROOM_RETRY_CNT);
 }