Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

hwmon: (nct6775) Fix platform driver suspend regression

Commit c3963bc0a0cf ("hwmon: (nct6775) Split core and platform
driver") introduced a slight change in nct6775_suspend() in order to
avoid an otherwise-needless symbol export for nct6775_update_device(),
replacing a call to that function with a simple dev_get_drvdata()
instead.

As it turns out, there is no guarantee that nct6775_update_device()
is ever called prior to suspend. If this happens, the resume function
ends up writing bad data into the various chip registers, which results
in a crash shortly after resume.

To fix the problem, just add the symbol export and return to using
nct6775_update_device() as was employed previously.

Reported-by: Zoltán Kővágó <dirty.ice.hu@gmail.com>
Tested-by: Zoltán Kővágó <dirty.ice.hu@gmail.com>
Fixes: c3963bc0a0cf ("hwmon: (nct6775) Split core and platform driver")
Cc: stable@kernel.org
Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
Link: https://lore.kernel.org/r/20220810052646.13825-1-zev@bewilderbeest.net
[groeck: Updated description]
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

authored by

Zev Weiss and committed by
Guenter Roeck
f4e6960f 7aeef154

+5 -2
+2 -1
drivers/hwmon/nct6775-core.c
··· 1480 1480 return 0; 1481 1481 } 1482 1482 1483 - static struct nct6775_data *nct6775_update_device(struct device *dev) 1483 + struct nct6775_data *nct6775_update_device(struct device *dev) 1484 1484 { 1485 1485 struct nct6775_data *data = dev_get_drvdata(dev); 1486 1486 int i, j, err = 0; ··· 1615 1615 mutex_unlock(&data->update_lock); 1616 1616 return err ? ERR_PTR(err) : data; 1617 1617 } 1618 + EXPORT_SYMBOL_GPL(nct6775_update_device); 1618 1619 1619 1620 /* 1620 1621 * Sysfs callback functions
+1 -1
drivers/hwmon/nct6775-platform.c
··· 359 359 { 360 360 int err; 361 361 u16 tmp; 362 - struct nct6775_data *data = dev_get_drvdata(dev); 362 + struct nct6775_data *data = nct6775_update_device(dev); 363 363 364 364 if (IS_ERR(data)) 365 365 return PTR_ERR(data);
+2
drivers/hwmon/nct6775.h
··· 196 196 return regmap_write(data->regmap, reg, value); 197 197 } 198 198 199 + struct nct6775_data *nct6775_update_device(struct device *dev); 200 + 199 201 bool nct6775_reg_is_word_sized(struct nct6775_data *data, u16 reg); 200 202 int nct6775_probe(struct device *dev, struct nct6775_data *data, 201 203 const struct regmap_config *regmapcfg);