---

yaml --- r: 220137 b: refs/heads/master c: e1517c0 h: refs/heads/master i: 220135: e7ff628 v: v3
git-mirror · Oct 6, 2010 · 841bb14 · 841bb14
1 parent c1afba4
commit 841bb14
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 858f1ccff123469fb4257e2529ef8783aabf3b62
+refs/heads/master: e1517c00da6d35911b6451f886d55e22d56393ad
diff --git a/trunk/drivers/staging/iio/adc/max1363_ring.c b/trunk/drivers/staging/iio/adc/max1363_ring.c
@@ -38,9 +38,8 @@ int max1363_single_channel_from_ring(long mask, struct max1363_state *st)
 		ret = -EBUSY;
 		goto error_ret;
 	}
-	numvals = hweight_long(st->current_mode->modemask);
 
-	ring_data = kmalloc(numvals*2, GFP_KERNEL);
+	ring_data = kmalloc(ring->access.get_bytes_per_datum(ring), GFP_KERNEL);
 	if (ring_data == NULL) {
 		ret = -ENOMEM;
 		goto error_ret;