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

Merge tag 'staging-5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 

Pull staging and IIO driver fixes from Greg KH:
 "Here are a number of small IIO and staging driver fixes for 5.15-rc6.

  They include:

   - vc04_services bugfix for reported problem

   - r8188eu array underflow fix

   - iio driver fixes for a lot of tiny reported issues.

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

* tag 'staging-5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: r8188eu: prevent array underflow in rtw_hal_update_ra_mask()
  staging: vc04_services: shut up out-of-range warning
  iio: light: opt3001: Fixed timeout error when 0 lux
  iio: adis16480: fix devices that do not support sleep mode
  iio: mtk-auxadc: fix case IIO_CHAN_INFO_PROCESSED
  iio: adis16475: fix deadlock on frequency set
  iio: ssp_sensors: add more range checking in ssp_parse_dataframe()
  iio: ssp_sensors: fix error code in ssp_print_mcu_debug()
  iio: adc: ad7793: Fix IRQ flag
  iio: adc: ad7780: Fix IRQ flag
  iio: adc: ad7192: Add IRQ flag
  iio: adc: aspeed: set driver data when adc probe.
  iio: adc: rzg2l_adc: add missing clk_disable_unprepare() in rzg2l_adc_pm_runtime_resume()
  iio: adc: max1027: Fix the number of max1X31 channels
  iio: adc: max1027: Fix wrong shift with 12-bit devices
  iio: adc128s052: Fix the error handling path of 'adc128_probe()'
  iio: adc: rzg2l_adc: Fix -EBUSY timeout error return
  iio: accel: fxls8962af: return IRQ_HANDLED when fifo is flushed
  iio: dac: ti-dac5571: fix an error code in probe()
parents b9e42b3c 37f12202

drivers/iio/accel/fxls8962af-core.c

+1 −1
Original line number Diff line number Diff line
@@ -738,7 +738,7 @@ static irqreturn_t fxls8962af_interrupt(int irq, void *p) 


	if (reg & FXLS8962AF_INT_STATUS_SRC_BUF) {

		ret = fxls8962af_fifo_flush(indio_dev);

		if (ret)

		if (ret < 0)

			return IRQ_NONE;



		return IRQ_HANDLED;

drivers/iio/adc/ad7192.c

+1 −0
Original line number Diff line number Diff line
@@ -293,6 +293,7 @@ static const struct ad_sigma_delta_info ad7192_sigma_delta_info = { 
	.has_registers = true,

	.addr_shift = 3,

	.read_mask = BIT(6),

	.irq_flags = IRQF_TRIGGER_FALLING,

};



static const struct ad_sd_calib_data ad7192_calib_arr[8] = {

drivers/iio/adc/ad7780.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ static const struct ad_sigma_delta_info ad7780_sigma_delta_info = { 
	.set_mode = ad7780_set_mode,

	.postprocess_sample = ad7780_postprocess_sample,

	.has_registers = false,

	.irq_flags = IRQF_TRIGGER_LOW,

	.irq_flags = IRQF_TRIGGER_FALLING,

};



#define _AD7780_CHANNEL(_bits, _wordsize, _mask_all)		\

drivers/iio/adc/ad7793.c

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ static const struct ad_sigma_delta_info ad7793_sigma_delta_info = { 
	.has_registers = true,

	.addr_shift = 3,

	.read_mask = BIT(6),

	.irq_flags = IRQF_TRIGGER_LOW,

	.irq_flags = IRQF_TRIGGER_FALLING,

};



static const struct ad_sd_calib_data ad7793_calib_arr[6] = {

drivers/iio/adc/aspeed_adc.c

+1 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ static int aspeed_adc_probe(struct platform_device *pdev) 


	data = iio_priv(indio_dev);

	data->dev = &pdev->dev;

	platform_set_drvdata(pdev, indio_dev);



	data->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(data->base))