diff options
| author | Roopa Prabhu <roprabhu@cisco.com> | 2010-08-10 20:55:20 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-17 11:32:58 +0200 |
| commit | 832177901a61aeda1f2122e323c39881ec84af65 (patch) | |
| tree | 4df41abbabfefc6fcd9eb32c389f36a12a8fd4f2 | |
| parent | enic: Clean up: remove enic_dev_stats_clear (diff) | |
| download | linux-832177901a61aeda1f2122e323c39881ec84af65.tar.xz linux-832177901a61aeda1f2122e323c39881ec84af65.zip | |
enic: Check if rq/wq buf not NULL before freeing them
Signed-off-by: Scott Feldman <scofeldm@cisco.com>
Signed-off-by: Roopa Prabhu <roprabhu@cisco.com>
Signed-off-by: Vasanthy Kolluri <vkolluri@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/enic/vnic_rq.c | 6 | ||||
| -rw-r--r-- | drivers/net/enic/vnic_wq.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/drivers/net/enic/vnic_rq.c b/drivers/net/enic/vnic_rq.c index dbb2aca258b9..b236d7cbc137 100644 --- a/drivers/net/enic/vnic_rq.c +++ b/drivers/net/enic/vnic_rq.c @@ -77,8 +77,10 @@ void vnic_rq_free(struct vnic_rq *rq) vnic_dev_free_desc_ring(vdev, &rq->ring); for (i = 0; i < VNIC_RQ_BUF_BLKS_MAX; i++) { - kfree(rq->bufs[i]); - rq->bufs[i] = NULL; + if (rq->bufs[i]) { + kfree(rq->bufs[i]); + rq->bufs[i] = NULL; + } } rq->ctrl = NULL; diff --git a/drivers/net/enic/vnic_wq.c b/drivers/net/enic/vnic_wq.c index 122e33bcc578..4b2a6c6a569b 100644 --- a/drivers/net/enic/vnic_wq.c +++ b/drivers/net/enic/vnic_wq.c @@ -77,8 +77,10 @@ void vnic_wq_free(struct vnic_wq *wq) vnic_dev_free_desc_ring(vdev, &wq->ring); for (i = 0; i < VNIC_WQ_BUF_BLKS_MAX; i++) { - kfree(wq->bufs[i]); - wq->bufs[i] = NULL; + if (wq->bufs[i]) { + kfree(wq->bufs[i]); + wq->bufs[i] = NULL; + } } wq->ctrl = NULL; |