Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f671fe2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-linus-v4.0-rc2' of... 

Merge tag 'hwmon-for-linus-v4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon fix from Guenter Roeck:
 "Add missing return value check to ads7828 driver"

* tag 'hwmon-for-linus-v4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (ads7828) Check return value of devm_regmap_init_i2c
parents ed42e71a d9ef72cd

drivers/hwmon/ads7828.c

+3 −0
Original line number Diff line number Diff line
@@ -147,6 +147,9 @@ static int ads7828_probe(struct i2c_client *client, 
						    &ads2830_regmap_config);

	}



	if (IS_ERR(data->regmap))

		return PTR_ERR(data->regmap);



	data->cmd_byte = ext_vref ? ADS7828_CMD_PD1 : ADS7828_CMD_PD3;

	if (!diff_input)

		data->cmd_byte |= ADS7828_CMD_SD_SE;