Skip to content

Commit c313bb7

Browse files
RaduSabau1gregkh
authored andcommitted
iio: adc: ad_sigma_delta: fix CS held asserted and state leaks
commit c72da06 upstream. In ad_sigma_delta_single_conversion(), set_mode(AD_SD_MODE_IDLE) and disable_one() were called from the out: block while keep_cs_asserted was still true. This caused any SPI transfer issued by those callbacks to carry cs_change=1, leaving CS permanently asserted after the conversion. Fix by moving both calls into the out_unlock: block, after keep_cs_asserted is cleared, matching the pattern already used in ad_sd_calibrate(). In the error path of ad_sd_buffer_postenable(), if an operation fails after set_mode(AD_SD_MODE_CONTINUOUS) has already succeeded (e.g. spi_offload_trigger_enable()), the device is left in continuous conversion mode with CS physically asserted. Additionally, bus_locked remaining true after spi_bus_unlock() causes subsequent SPI operations to call spi_sync_locked() without the bus lock actually held, allowing concurrent SPI access. Fix the error path by clearing keep_cs_asserted first, then calling set_mode(AD_SD_MODE_IDLE) to revert the device mode and deassert CS, then clearing bus_locked before releasing the bus. For devices that implement neither set_mode nor disable_one (such as MAX11205, which has no physical CS pin), no SPI transfer is issued during cleanup and the cs_change flag has no effect on any physical line. Fixes: 132d44d ("iio: adc: ad_sigma_delta: Check for previous ready signals") Signed-off-by: Radu Sabau <radu.sabau@analog.com> Cc: <Stable@vger.kernel.org> Signed-off-by: Jonathan Cameron <jic23@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 3394e0b commit c313bb7

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

drivers/iio/adc/ad_sigma_delta.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -466,11 +466,10 @@ int ad_sigma_delta_single_conversion(struct iio_dev *indio_dev,
466466
out:
467467
ad_sd_disable_irq(sigma_delta);
468468

469-
ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_IDLE);
470-
ad_sigma_delta_disable_one(sigma_delta, chan->address);
471-
472469
out_unlock:
473470
sigma_delta->keep_cs_asserted = false;
471+
ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_IDLE);
472+
ad_sigma_delta_disable_one(sigma_delta, chan->address);
474473
sigma_delta->bus_locked = false;
475474
spi_bus_unlock(sigma_delta->spi->controller);
476475
out_release:
@@ -603,6 +602,9 @@ static int ad_sd_buffer_postenable(struct iio_dev *indio_dev)
603602
return 0;
604603

605604
err_unlock:
605+
sigma_delta->keep_cs_asserted = false;
606+
ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_IDLE);
607+
sigma_delta->bus_locked = false;
606608
spi_bus_unlock(sigma_delta->spi->controller);
607609
spi_unoptimize_message(&sigma_delta->sample_msg);
608610

0 commit comments

Comments
 (0)