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

Merge tag 'char-misc-5.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 

Pull char/misc driver fixes from Greg KH:
 "Here are a few small driver fixes for 5.17-rc6 for reported issues.

  The majority of these are IIO fixes for small things, and the other
  two are a mvmem and mtd core conflict fix.

  All of these have been in linux-next with no reported issues"

* tag 'char-misc-5.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  mtd: core: Fix a conflict between MTD and NVMEM on wp-gpios property
  nvmem: core: Fix a conflict between MTD and NVMEM on wp-gpios property
  iio: imu: st_lsm6dsx: wait for settling time in st_lsm6dsx_read_oneshot
  iio: Fix error handling for PM
  iio: addac: ad74413r: correct comparator gpio getters mask usage
  iio: addac: ad74413r: use ngpio size when iterating over mask
  iio: addac: ad74413r: Do not reference negative array offsets
  iio: adc: men_z188_adc: Fix a resource leak in an error handling path
  iio: frequency: admv1013: remove the always true condition
  iio: accel: fxls8962af: add padding to regmap for SPI
  iio:imu:adis16480: fix buffering for devices with no burst mode
  iio: adc: ad7124: fix mask used for setting AIN_BUFP & AIN_BUFM bits
  iio: adc: tsc2046: fix memory corruption by preventing array overflow
parents d68ccfdb 6c762189

drivers/iio/accel/bmc150-accel-core.c

+4 −1
Original line number Diff line number Diff line
@@ -1783,11 +1783,14 @@ int bmc150_accel_core_probe(struct device *dev, struct regmap *regmap, int irq, 
	ret = iio_device_register(indio_dev);

	if (ret < 0) {

		dev_err(dev, "Unable to register iio device\n");

		goto err_trigger_unregister;

		goto err_pm_cleanup;

	}



	return 0;



err_pm_cleanup:

	pm_runtime_dont_use_autosuspend(dev);

	pm_runtime_disable(dev);

err_trigger_unregister:

	bmc150_accel_unregister_triggers(data, BMC150_ACCEL_TRIGGERS - 1);

err_buffer_cleanup:

drivers/iio/accel/fxls8962af-core.c

+10 −2
Original line number Diff line number Diff line
@@ -173,12 +173,20 @@ struct fxls8962af_data { 
	u16 upper_thres;

};



const struct regmap_config fxls8962af_regmap_conf = {

const struct regmap_config fxls8962af_i2c_regmap_conf = {

	.reg_bits = 8,

	.val_bits = 8,

	.max_register = FXLS8962AF_MAX_REG,

};

EXPORT_SYMBOL_GPL(fxls8962af_regmap_conf);

EXPORT_SYMBOL_GPL(fxls8962af_i2c_regmap_conf);



const struct regmap_config fxls8962af_spi_regmap_conf = {

	.reg_bits = 8,

	.pad_bits = 8,

	.val_bits = 8,

	.max_register = FXLS8962AF_MAX_REG,

};

EXPORT_SYMBOL_GPL(fxls8962af_spi_regmap_conf);



enum {

	fxls8962af_idx_x,

drivers/iio/accel/fxls8962af-i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ static int fxls8962af_probe(struct i2c_client *client) 
{

	struct regmap *regmap;



	regmap = devm_regmap_init_i2c(client, &fxls8962af_regmap_conf);

	regmap = devm_regmap_init_i2c(client, &fxls8962af_i2c_regmap_conf);

	if (IS_ERR(regmap)) {

		dev_err(&client->dev, "Failed to initialize i2c regmap\n");

		return PTR_ERR(regmap);

drivers/iio/accel/fxls8962af-spi.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ static int fxls8962af_probe(struct spi_device *spi) 
{

	struct regmap *regmap;



	regmap = devm_regmap_init_spi(spi, &fxls8962af_regmap_conf);

	regmap = devm_regmap_init_spi(spi, &fxls8962af_spi_regmap_conf);

	if (IS_ERR(regmap)) {

		dev_err(&spi->dev, "Failed to initialize spi regmap\n");

		return PTR_ERR(regmap);

drivers/iio/accel/fxls8962af.h

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ int fxls8962af_core_probe(struct device *dev, struct regmap *regmap, int irq); 
int fxls8962af_core_remove(struct device *dev);



extern const struct dev_pm_ops fxls8962af_pm_ops;

extern const struct regmap_config fxls8962af_regmap_conf;

extern const struct regmap_config fxls8962af_i2c_regmap_conf;

extern const struct regmap_config fxls8962af_spi_regmap_conf;



#endif				/* _FXLS8962AF_H_ */