2 files changed, 2 insertions, 1 deletions

diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c
index 95eef8e89979..e0dc2d0e7590 100644
--- a/drivers/iio/adc/ti_am335x_adc.c
+++ b/drivers/iio/adc/ti_am335x_adc.c
@@ -199,6 +199,7 @@ static int tiadc_buffer_predisable(struct iio_dev *indio_dev)
         tiadc_writel(adc_dev, REG_IRQCLR, (IRQENB_FIFO1THRES |
                                 IRQENB_FIFO1OVRRUN | IRQENB_FIFO1UNDRFLW));
         am335x_tsc_se_clr(adc_dev->mfd_tscadc, adc_dev->buffer_en_ch_steps);
+        adc_dev->buffer_en_ch_steps = 0;
 
         /* Flush FIFO of leftover data in the time it takes to disable adc */
         fifo1count = tiadc_readl(adc_dev, REG_FIFO1CNT);
@@ -491,6 +492,7 @@ static int tiadc_resume(struct device *dev)
         tiadc_writel(adc_dev, REG_CTRL, restore);
 
         tiadc_step_config(indio_dev);
+        am335x_tsc_se_set(adc_dev->mfd_tscadc, adc_dev->buffer_en_ch_steps);
 
         return 0;
 }
diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c
index cb0c211fc7d8..157f5699a33c 100644
--- a/drivers/mfd/ti_am335x_tscadc.c
+++ b/drivers/mfd/ti_am335x_tscadc.c
@@ -309,7 +309,6 @@ static int tscadc_resume(struct device *dev)
 
         if (tscadc_dev->tsc_cell != -1)
                 tscadc_idle_config(tscadc_dev);
-        am335x_tsc_se_update(tscadc_dev);
         restore = tscadc_readl(tscadc_dev, REG_CTRL);
         tscadc_writel(tscadc_dev, REG_CTRL,
                         (restore | CNTRLREG_TSCSSENB));