From 3dfd871d464f7edc9a23c14fb061b386d4821933 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Fri, 15 Jun 2012 18:08:59 +0200 Subject: [PATCH] --- yaml --- r: 317398 b: refs/heads/master c: aff1eb4e3dd13ee419c6cd76baf1bcc2edeaaa86 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/iio/industrialio-buffer.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ff5cd4cf38c8..78253b11f299 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb1c4bcd721fcc30d6e43f60a244483dc0d07056 +refs/heads/master: aff1eb4e3dd13ee419c6cd76baf1bcc2edeaaa86 diff --git a/trunk/drivers/iio/industrialio-buffer.c b/trunk/drivers/iio/industrialio-buffer.c index ac185b8694bd..2f35db93cdb6 100644 --- a/trunk/drivers/iio/industrialio-buffer.c +++ b/trunk/drivers/iio/industrialio-buffer.c @@ -553,6 +553,10 @@ int iio_sw_buffer_preenable(struct iio_dev *indio_dev) buffer->scan_mask); else indio_dev->active_scan_mask = buffer->scan_mask; + + if (indio_dev->active_scan_mask == NULL) + return -EINVAL; + iio_update_demux(indio_dev); if (indio_dev->info->update_scan_mode)