linux-next: manual merge of the staging tree with the staging.current tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/iio/industrialio-buffer.c between commit d66e0452bf6b ("iio: Fix
crash when scan_bytes is computed with active_scan_mask == NUL") from the
staging.current tree and commit 705ee2c98a37 ("iio:buffer: Simplify
iio_buffer_is_active()") from the staging tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --cc drivers/iio/industrialio-buffer.c
index 2710f72,2361fbc..0000000
--- a/drivers/iio/industrialio-buffer.c
+++ b/drivers/iio/industrialio-buffer.c
@@@ -546,16 -521,9 +540,16 @@@ int iio_update_buffers(struct iio_dev *
                         * Roll back.
                         * Note can only occur when adding a buffer.
                         */
-                       list_del(&insert_buffer->buffer_list);
+                       list_del_init(&insert_buffer->buffer_list);
 -                      indio_dev->active_scan_mask = old_mask;
 -                      success = -EINVAL;
 +                      if (old_mask) {
 +                              indio_dev->active_scan_mask = old_mask;
 +                              success = -EINVAL;
 +                      }
 +                      else {
 +                              kfree(compound_mask);
 +                              ret = -EINVAL;
 +                              goto error_ret;
 +                      }
                }
        } else {
                indio_dev->active_scan_mask = compound_mask;

pgp4dZd1JWVOt.pgp
Description: PGP signature