diff options
| author | Miquel Raynal <miquel.raynal@bootlin.com> | 2021-06-30 12:52:24 +0200 |
|---|---|---|
| committer | Miquel Raynal <miquel.raynal@bootlin.com> | 2021-06-30 12:52:24 +0200 |
| commit | 0bcc3939c98d83955397eac1584d5f791fdc88d0 (patch) | |
| tree | 21e6be9c578916ca86ffe0f88a9d807435318964 /drivers/hwmon/occ/common.c | |
| parent | Merge tag 'nand/for-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/mt... (diff) | |
| parent | mtd: spi-nor: remove redundant continue statement (diff) | |
| download | linux-0bcc3939c98d83955397eac1584d5f791fdc88d0.tar.xz linux-0bcc3939c98d83955397eac1584d5f791fdc88d0.zip | |
Merge tag 'spi-nor/for-5.14' into mtd/next
SPI NOR core changes:
- Ability to dump SFDP tables via sysfs
- Support for erasing OTP regions on Winbond and similar flashes
- Few API doc updates and fixes
- Locking support for MX25L12805D
SPI NOR controller drivers changes:
- Use SPI_MODE_X_MASK in nxp-spifi
- Intel Alder Lake-M SPI serial flash support
Diffstat (limited to 'drivers/hwmon/occ/common.c')
| -rw-r--r-- | drivers/hwmon/occ/common.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/hwmon/occ/common.c b/drivers/hwmon/occ/common.c index f1ac153d0b56..967532afb1c0 100644 --- a/drivers/hwmon/occ/common.c +++ b/drivers/hwmon/occ/common.c @@ -217,9 +217,9 @@ int occ_update_response(struct occ *occ) return rc; /* limit the maximum rate of polling the OCC */ - if (time_after(jiffies, occ->last_update + OCC_UPDATE_FREQUENCY)) { + if (time_after(jiffies, occ->next_update)) { rc = occ_poll(occ); - occ->last_update = jiffies; + occ->next_update = jiffies + OCC_UPDATE_FREQUENCY; } else { rc = occ->last_error; } @@ -1165,6 +1165,7 @@ int occ_setup(struct occ *occ, const char *name) return rc; } + occ->next_update = jiffies + OCC_UPDATE_FREQUENCY; occ_parse_poll_response(occ); rc = occ_setup_sensor_attrs(occ); |