---

yaml --- r: 377417 b: refs/heads/master c: 9fa8e98 h: refs/heads/master i: 377415: 5e29c15 v: v3
git-mirror · Jun 20, 2013 · bd43b42 · bd43b42
1 parent cb37f29
commit bd43b42
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 451bff2932a69e904f41a180145de1d2358bb8f5
+refs/heads/master: 9fa8e980bb0a56e46ddd97731f83f608c39aa7a5
diff --git a/trunk/drivers/net/ethernet/marvell/mv643xx_eth.c b/trunk/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -1757,7 +1757,7 @@ static int rxq_init(struct mv643xx_eth_private *mp, int index)
 	memset(rxq->rx_desc_area, 0, size);
 
 	rxq->rx_desc_area_size = size;
-	rxq->rx_skb = kmalloc_array(rxq->rx_ring_size, sizeof(*rxq->rx_skb),
+	rxq->rx_skb = kcalloc(rxq->rx_ring_size, sizeof(*rxq->rx_skb),
 				    GFP_KERNEL);
 	if (rxq->rx_skb == NULL)
 		goto out_free;