From 9df11bc2364d0f92c52257b80ff025a82018a09e Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Fri, 31 Dec 2010 11:18:48 -0800 Subject: [PATCH] --- yaml --- r: 223763 b: refs/heads/master c: f7e4c9775ea648deed4a8193951e50d0c7706173 h: refs/heads/master i: 223761: 65ef1690466e5897e7a2928ca26c63d6281f483e 223759: 6a6b25130689f3ee5af8511f452116e3b807e3cd v: v3 --- [refs] | 2 +- trunk/drivers/net/cnic.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7b48c3f68045..2fbbf7a6aaba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2393c944d5d60eedaede80273ede8a816b5fa3e0 +refs/heads/master: f7e4c9775ea648deed4a8193951e50d0c7706173 diff --git a/trunk/drivers/net/cnic.c b/trunk/drivers/net/cnic.c index 92bac19ad60a..6dff32196c92 100644 --- a/trunk/drivers/net/cnic.c +++ b/trunk/drivers/net/cnic.c @@ -940,7 +940,7 @@ static int cnic_alloc_uio_rings(struct cnic_dev *dev, int pages) &udev->l2_ring_map, GFP_KERNEL | __GFP_COMP); if (!udev->l2_ring) - return -ENOMEM; + goto err_udev; udev->l2_buf_size = (cp->l2_rx_ring_size + 1) * cp->l2_single_buf_size; udev->l2_buf_size = PAGE_ALIGN(udev->l2_buf_size); @@ -948,7 +948,7 @@ static int cnic_alloc_uio_rings(struct cnic_dev *dev, int pages) &udev->l2_buf_map, GFP_KERNEL | __GFP_COMP); if (!udev->l2_buf) - return -ENOMEM; + goto err_dma; write_lock(&cnic_dev_lock); list_add(&udev->list, &cnic_udev_list); @@ -959,6 +959,12 @@ static int cnic_alloc_uio_rings(struct cnic_dev *dev, int pages) cp->udev = udev; return 0; + err_dma: + dma_free_coherent(&udev->pdev->dev, udev->l2_ring_size, + udev->l2_ring, udev->l2_ring_map); + err_udev: + kfree(udev); + return -ENOMEM; } static int cnic_init_uio(struct cnic_dev *dev)