diff options
author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2018-03-27 18:27:34 +0200 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2018-04-04 02:38:39 +0200 |
commit | 2e1f44f6ad8008be353c7c99286f7a747b4b3cf4 (patch) | |
tree | 9ab4f369e72a6f1953f53269030bbba047c6be8a /drivers/scsi/sym53c8xx_2/sym_hipd.c | |
parent | scsi: ufs: Add support for Auto-Hibernate Idle Timer (diff) | |
parent | scsi: qla2xxx: fx00 copypaste typo (diff) | |
download | linux-2e1f44f6ad8008be353c7c99286f7a747b4b3cf4.tar.xz linux-2e1f44f6ad8008be353c7c99286f7a747b4b3cf4.zip |
Merge branch 'fixes' into misc
Somewhat nasty merge due to conflicts between "33b28357dd00 scsi:
qla2xxx: Fix Async GPN_FT for FCP and FC-NVMe scan" and "2b5b96473efc
scsi: qla2xxx: Fix FC-NVMe LUN discovery"
Merge is non-trivial and has been verified by Qlogic (Cavium)
Signed-off-by: James E.J. Bottomley <jejb@linux.vnet.ibm.com>
Diffstat (limited to 'drivers/scsi/sym53c8xx_2/sym_hipd.c')
-rw-r--r-- | drivers/scsi/sym53c8xx_2/sym_hipd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c index ca360daa6a25..378af306fda1 100644 --- a/drivers/scsi/sym53c8xx_2/sym_hipd.c +++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c @@ -536,7 +536,7 @@ sym_getsync(struct sym_hcb *np, u_char dt, u_char sfac, u_char *divp, u_char *fa * Look for the greatest clock divisor that allows an * input speed faster than the period. */ - while (div-- > 0) + while (--div > 0) if (kpc >= (div_10M[div] << 2)) break; /* |