---

yaml --- r: 317398 b: refs/heads/master c: aff1eb4 h: refs/heads/master v: v3
git-mirror · Jun 15, 2012 · 3dfd871 · 3dfd871
1 parent 054e431
commit 3dfd871
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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)