---

yaml --- r: 317819 b: refs/heads/master c: da0f01e h: refs/heads/master i: 317817: fd80c5b 317815: 075b746 v: v3
git-mirror · Jul 8, 2012 · a888e0e · a888e0e
1 parent eda1997
commit a888e0e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46b2495cc79484769e6c9364bf8f2e8b8e9de1aa
+refs/heads/master: da0f01e1ed88b4ac650d884e4e2ee11c9cd4d83b
diff --git a/trunk/drivers/staging/iio/adc/max1363_ring.c b/trunk/drivers/staging/iio/adc/max1363_ring.c
@@ -64,11 +64,11 @@ static irqreturn_t max1363_trigger_handler(int irq, void *p)
 	 * no harm.
 	 */
 	if (numvals == 0)
-		return IRQ_HANDLED;
+		goto done;
 
 	rxbuf = kmalloc(d_size,	GFP_KERNEL);
 	if (rxbuf == NULL)
-		return -ENOMEM;
+		goto done;
 	if (st->chip_info->bits != 8)
 		b_sent = i2c_master_recv(st->client, rxbuf, numvals*2);
 	else