diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-19 22:05:38 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-19 22:05:38 +0200 |
| commit | a7204d72db251784808b0c050220992d7f833a2c (patch) | |
| tree | 3491452ea74b039f3278fd95bb7ad7c88b6b3631 /drivers/iio/industrialio-buffer.c | |
| parent | i2o: convert bus code to use dev_groups (diff) | |
| parent | Linux 3.12-rc6 (diff) | |
| download | linux-a7204d72db251784808b0c050220992d7f833a2c.tar.xz linux-a7204d72db251784808b0c050220992d7f833a2c.zip | |
Merge 3.12-rc6 into driver-core-next
We want these fixes here too.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/industrialio-buffer.c')
| -rw-r--r-- | drivers/iio/industrialio-buffer.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c index 2710f7245c3b..2db7dcd826b9 100644 --- a/drivers/iio/industrialio-buffer.c +++ b/drivers/iio/industrialio-buffer.c @@ -477,6 +477,9 @@ void iio_disable_all_buffers(struct iio_dev *indio_dev) indio_dev->currentmode = INDIO_DIRECT_MODE; if (indio_dev->setup_ops->postdisable) indio_dev->setup_ops->postdisable(indio_dev); + + if (indio_dev->available_scan_masks == NULL) + kfree(indio_dev->active_scan_mask); } int iio_update_buffers(struct iio_dev *indio_dev, |