From 0361065605f804cedc1691b78cc2e2c13cb44fee Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Sat, 27 Nov 2010 23:05:44 +0000
Subject: [PATCH] --- yaml --- r: 224527 b: refs/heads/master c:
 f3167460144cd2c24b964a32d40d32f851b5d5f4 h: refs/heads/master i:   224525:
 a7fd65a1df592d7d4301311d4d990943b2679844   224523:
 a2a47e5462a1f2c2bb4d198d29f30b521f332930   224519:
 5a79edb4c31c547e8d98c2457678139b32f4e30c   224511:
 44fef5721327109c3f69416d59815987af9428d6 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/net/qlcnic/qlcnic_init.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9c815d705f77..e247ae0d2297 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0acdf68f495793143802dd4f3e47918dddcceed7
+refs/heads/master: f3167460144cd2c24b964a32d40d32f851b5d5f4
diff --git a/trunk/drivers/net/qlcnic/qlcnic_init.c b/trunk/drivers/net/qlcnic/qlcnic_init.c
index 3f970187cfce..c5ea2f4eb980 100644
--- a/trunk/drivers/net/qlcnic/qlcnic_init.c
+++ b/trunk/drivers/net/qlcnic/qlcnic_init.c
@@ -274,8 +274,7 @@ int qlcnic_alloc_sw_resources(struct qlcnic_adapter *adapter)
 				rds_ring->dma_size + NET_IP_ALIGN;
 			break;
 		}
-		rds_ring->rx_buf_arr = (struct qlcnic_rx_buffer *)
-			vzalloc(RCV_BUFF_RINGSIZE(rds_ring));
+		rds_ring->rx_buf_arr = vzalloc(RCV_BUFF_RINGSIZE(rds_ring));
 		if (rds_ring->rx_buf_arr == NULL) {
 			dev_err(&netdev->dev, "Failed to allocate "
 				"rx buffer ring %d\n", ring);