Commit f4144564 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-fixes-for-v6.0-rc1' of... 

Merge tag 'hwmon-fixes-for-v6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon fixes from Guenter Roeck:
 "Fix two regressions in nct6775 and lm90 drivers"

* tag 'hwmon-fixes-for-v6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (nct6775) Fix platform driver suspend regression
  hwmon: (lm90) Fix error return value from detect function
parents b196f3d1 f4e6960f

drivers/hwmon/lm90.c

+1 −1
Original line number Diff line number Diff line
@@ -2321,7 +2321,7 @@ static const char *lm90_detect_nuvoton(struct i2c_client *client, int chip_id, 
	const char *name = NULL;



	if (config2 < 0)

		return ERR_PTR(-ENODEV);

		return NULL;



	if (address == 0x4c && !(config1 & 0x2a) && !(config2 & 0xf8)) {

		if (chip_id == 0x01 && convrate <= 0x09) {

drivers/hwmon/nct6775-core.c

+2 −1
Original line number Diff line number Diff line
@@ -1480,7 +1480,7 @@ static int nct6775_update_pwm_limits(struct device *dev) 
	return 0;

}



static struct nct6775_data *nct6775_update_device(struct device *dev)

struct nct6775_data *nct6775_update_device(struct device *dev)

{

	struct nct6775_data *data = dev_get_drvdata(dev);

	int i, j, err = 0;
@@ -1615,6 +1615,7 @@ static struct nct6775_data *nct6775_update_device(struct device *dev) 
	mutex_unlock(&data->update_lock);

	return err ? ERR_PTR(err) : data;

}

EXPORT_SYMBOL_GPL(nct6775_update_device);



/*

 * Sysfs callback functions

drivers/hwmon/nct6775-platform.c

+1 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ static int __maybe_unused nct6775_suspend(struct device *dev) 
{

	int err;

	u16 tmp;

	struct nct6775_data *data = dev_get_drvdata(dev);

	struct nct6775_data *data = nct6775_update_device(dev);



	if (IS_ERR(data))

		return PTR_ERR(data);

drivers/hwmon/nct6775.h

+2 −0
Original line number Diff line number Diff line
@@ -196,6 +196,8 @@ static inline int nct6775_write_value(struct nct6775_data *data, u16 reg, u16 va 
	return regmap_write(data->regmap, reg, value);

}



struct nct6775_data *nct6775_update_device(struct device *dev);



bool nct6775_reg_is_word_sized(struct nct6775_data *data, u16 reg);

int nct6775_probe(struct device *dev, struct nct6775_data *data,

		  const struct regmap_config *regmapcfg);