2 files changed, 6 insertions, 2 deletions

diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
index 403b72878b0b..71333140d42c 100644
--- a/drivers/iio/industrialio-buffer.c
+++ b/drivers/iio/industrialio-buffer.c
@@ -639,6 +639,8 @@ static int __iio_update_buffers(struct iio_dev *indio_dev,
                 indio_dev->currentmode = INDIO_BUFFER_TRIGGERED;
         } else if (indio_dev->modes & INDIO_BUFFER_HARDWARE) {
                 indio_dev->currentmode = INDIO_BUFFER_HARDWARE;
+        } else if (indio_dev->modes & INDIO_BUFFER_SOFTWARE) {
+                indio_dev->currentmode = INDIO_BUFFER_SOFTWARE;
         } else { /* Should never be reached */
                 ret = -EINVAL;
                 goto error_run_postdisable;
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
index 878d861b0610..590202024857 100644
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
@@ -286,10 +286,11 @@ static inline s64 iio_get_time_ns(void)
 /* Device operating modes */
 #define INDIO_DIRECT_MODE               0x01
 #define INDIO_BUFFER_TRIGGERED          0x02
+#define INDIO_BUFFER_SOFTWARE           0x04
 #define INDIO_BUFFER_HARDWARE           0x08
 
 #define INDIO_ALL_BUFFER_MODES                                  \
-        (INDIO_BUFFER_TRIGGERED | INDIO_BUFFER_HARDWARE)
+        (INDIO_BUFFER_TRIGGERED | INDIO_BUFFER_HARDWARE | INDIO_BUFFER_SOFTWARE)
 
 #define INDIO_MAX_RAW_ELEMENTS          4
 
@@ -593,7 +594,8 @@ void devm_iio_trigger_free(struct device *dev, struct iio_trigger *iio_trig);
 static inline bool iio_buffer_enabled(struct iio_dev *indio_dev)
 {
         return indio_dev->currentmode
-                & (INDIO_BUFFER_TRIGGERED | INDIO_BUFFER_HARDWARE);
+                & (INDIO_BUFFER_TRIGGERED | INDIO_BUFFER_HARDWARE |
+                   INDIO_BUFFER_SOFTWARE);
 }
 
 /**