diff options
author | Anirban Chakraborty <anirban.chakraborty@qlogic.com> | 2010-05-16 21:22:08 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-05-17 20:30:53 -0400 |
commit | aadd8184ae4b3f0c7874929a1b0248aafc29e509 (patch) | |
tree | eba828488d708dd7d1b8bd5eb88075f5bb1335d3 /drivers/net/qlcnic/qlcnic_init.c | |
parent | 0e995cd3d3c78377a0bc7d38236fc50e5438fabb (diff) |
qlcnic: fix memory leaks
Fixes memory leak in error path when memory allocation
for adapter data structures fails.
Signed-off-by: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/qlcnic/qlcnic_init.c')
-rw-r--r-- | drivers/net/qlcnic/qlcnic_init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/qlcnic/qlcnic_init.c b/drivers/net/qlcnic/qlcnic_init.c index 77bfdaba83e..dccd8c3d65e 100644 --- a/drivers/net/qlcnic/qlcnic_init.c +++ b/drivers/net/qlcnic/qlcnic_init.c | |||
@@ -210,7 +210,7 @@ int qlcnic_alloc_sw_resources(struct qlcnic_adapter *adapter) | |||
210 | cmd_buf_arr = vmalloc(TX_BUFF_RINGSIZE(tx_ring)); | 210 | cmd_buf_arr = vmalloc(TX_BUFF_RINGSIZE(tx_ring)); |
211 | if (cmd_buf_arr == NULL) { | 211 | if (cmd_buf_arr == NULL) { |
212 | dev_err(&netdev->dev, "failed to allocate cmd buffer ring\n"); | 212 | dev_err(&netdev->dev, "failed to allocate cmd buffer ring\n"); |
213 | return -ENOMEM; | 213 | goto err_out; |
214 | } | 214 | } |
215 | memset(cmd_buf_arr, 0, TX_BUFF_RINGSIZE(tx_ring)); | 215 | memset(cmd_buf_arr, 0, TX_BUFF_RINGSIZE(tx_ring)); |
216 | tx_ring->cmd_buf_arr = cmd_buf_arr; | 216 | tx_ring->cmd_buf_arr = cmd_buf_arr; |
@@ -221,7 +221,7 @@ int qlcnic_alloc_sw_resources(struct qlcnic_adapter *adapter) | |||
221 | rds_ring = kzalloc(size, GFP_KERNEL); | 221 | rds_ring = kzalloc(size, GFP_KERNEL); |
222 | if (rds_ring == NULL) { | 222 | if (rds_ring == NULL) { |
223 | dev_err(&netdev->dev, "failed to allocate rds ring struct\n"); | 223 | dev_err(&netdev->dev, "failed to allocate rds ring struct\n"); |
224 | return -ENOMEM; | 224 | goto err_out; |
225 | } | 225 | } |
226 | recv_ctx->rds_rings = rds_ring; | 226 | recv_ctx->rds_rings = rds_ring; |
227 | 227 | ||