summaryrefslogtreecommitdiff
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-06-10 08:47:18 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-06-10 08:47:18 +0200
commit800370b05b76c5a6111a97d6f41c9986a29e38a3 (patch)
tree7e48099cf689b32feae3853e55e54d804936bda4 /drivers/hwmon
parent762b296bcbbc7344752ebf3a25583cf38f8adbdc (diff)
parent9ab1428dfe2c66b51e0b41337cd0164da0ab6080 (diff)
Merge tag 'fsi-for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi into char-misc-next
Joel writes: FSI changes for v5.14 - Bug fixes for the OCC, SCOM and SBEFIFO drivers - Performance fix for aspeed fsi master - Small fixes from the mailing lists * tag 'fsi-for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi: fsi/sbefifo: Fix reset timeout fsi/sbefifo: Clean up correct FIFO when receiving reset request from SBE fsi: master-ast-cf: Remove redundant error printing in fsi_master_acf_probe() fsi: Aspeed: Reduce poll timeout fsi: aspeed: convert to devm_platform_ioremap_resource hwmon: (occ) Print response status in first poll error message hwmon: (occ) Start sequence number at one fsi: occ: Log error for checksum failure fsi: occ: Don't accept response from un-initialized OCC fsi: scom: Remove retries fsi: scom: Reset the FSI2PIB engine for any error fsi: aspeed: Emit fewer barriers in opb operations fsi: core: Fix return of error values on failures fsi: Add missing MODULE_DEVICE_TABLE
Diffstat (limited to 'drivers/hwmon')
-rw-r--r--drivers/hwmon/occ/common.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/hwmon/occ/common.c b/drivers/hwmon/occ/common.c
index 967532afb1c0..0d68a78be980 100644
--- a/drivers/hwmon/occ/common.c
+++ b/drivers/hwmon/occ/common.c
@@ -1151,6 +1151,8 @@ int occ_setup(struct occ *occ, const char *name)
{
int rc;
+ /* start with 1 to avoid false match with zero-initialized SRAM buffer */
+ occ->seq_no = 1;
mutex_init(&occ->lock);
occ->groups[0] = &occ->group;
@@ -1160,8 +1162,9 @@ int occ_setup(struct occ *occ, const char *name)
dev_info(occ->bus_dev, "host is not ready\n");
return rc;
} else if (rc < 0) {
- dev_err(occ->bus_dev, "failed to get OCC poll response: %d\n",
- rc);
+ dev_err(occ->bus_dev,
+ "failed to get OCC poll response=%02x: %d\n",
+ occ->resp.return_status, rc);
return rc;
}