diff options
| author | Michael Chan | 2012-09-08 08:01:02 +0200 |
|---|---|---|
| committer | David S. Miller | 2012-09-10 21:48:20 +0200 |
| commit | f81b0ac475f617c93aeb372140b20cae267294c3 (patch) | |
| tree | 169fd1ac31ce6f9362a993be2e95376d2b8d5b4c /drivers/net/ethernet/broadcom/cnic.c | |
| parent | cnic: Add functions to allocate and free UIO rings (diff) | |
| download | kernel-qcow2-linux-f81b0ac475f617c93aeb372140b20cae267294c3.tar.gz kernel-qcow2-linux-f81b0ac475f617c93aeb372140b20cae267294c3.tar.xz kernel-qcow2-linux-f81b0ac475f617c93aeb372140b20cae267294c3.zip | |
cnic: Free UIO rings when the device is closed.
This will free up unneeded memory.
Reviewed-by: Eddie Wai <eddie.wai@broadcom.com>
Reviewed-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/cnic.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/cnic.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c index ff3589405dce..38be4d91783b 100644 --- a/drivers/net/ethernet/broadcom/cnic.c +++ b/drivers/net/ethernet/broadcom/cnic.c @@ -868,6 +868,8 @@ static void cnic_free_resc(struct cnic_dev *dev) if (udev) { udev->dev = NULL; cp->udev = NULL; + if (udev->uio_dev == -1) + __cnic_free_uio_rings(udev); } cnic_free_context(dev); @@ -1039,6 +1041,11 @@ static int cnic_alloc_uio_rings(struct cnic_dev *dev, int pages) list_for_each_entry(udev, &cnic_udev_list, list) { if (udev->pdev == dev->pcidev) { udev->dev = dev; + if (__cnic_alloc_uio_rings(udev, pages)) { + udev->dev = NULL; + read_unlock(&cnic_dev_lock); + return -ENOMEM; + } cp->udev = udev; read_unlock(&cnic_dev_lock); return 0; |