---

yaml --- r: 317815 b: refs/heads/master c: a1bdeef h: refs/heads/master i: 317813: ac93a76 317811: 101c825 317807: 91ddbe4 v: v3
git-mirror · Jul 8, 2012 · 075b746 · 075b746
1 parent 4a94cb1
commit 075b746
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a4eef3057dff597099673c42f8e3d0455deb9fe1
+refs/heads/master: a1bdeefd7bccabb265fa9c74811008a8582c1c7d
diff --git a/trunk/drivers/staging/iio/iio_simple_dummy_buffer.c b/trunk/drivers/staging/iio/iio_simple_dummy_buffer.c
@@ -52,7 +52,7 @@ static irqreturn_t iio_simple_dummy_trigger_h(int irq, void *p)
 
 	data = kmalloc(indio_dev->scan_bytes, GFP_KERNEL);
 	if (data == NULL)
-		return -ENOMEM;
+		goto done;
 
 	if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength)) {
 		/*
@@ -91,6 +91,7 @@ static irqreturn_t iio_simple_dummy_trigger_h(int irq, void *p)
 
 	kfree(data);
 
+done:
 	/*
 	 * Tell the core we are done with this trigger and ready for the
 	 * next one.