From: Sathya Perla Date: Thu, 23 Feb 2012 18:50:15 +0000 (+0000) Subject: be2net: reset queue address after freeing X-Git-Tag: v2.6.39-400.9.0~423^2~124^2~6 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1c6be1c2fc1d6bcbfa3c9c3c2a159117b5fba521;p=users%2Fjedix%2Flinux-maple.git be2net: reset queue address after freeing This will prevent double free in some cases where be_clear() is called for cleanup when be_setup() fails half-way. Signed-off-by: Sathya Perla Signed-off-by: David S. Miller --- diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index a8dd70998e6e..e8995e669901 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c @@ -126,9 +126,11 @@ static inline bool be_is_mc(struct be_adapter *adapter) { static void be_queue_free(struct be_adapter *adapter, struct be_queue_info *q) { struct be_dma_mem *mem = &q->dma_mem; - if (mem->va) + if (mem->va) { dma_free_coherent(&adapter->pdev->dev, mem->size, mem->va, mem->dma); + mem->va = NULL; + } } static int be_queue_alloc(struct be_adapter *adapter, struct be_queue_info *q, @@ -1676,7 +1678,7 @@ static int be_evt_queues_create(struct be_adapter *adapter) if (rc) return rc; } - return rc; + return 0; } static void be_mcc_queues_destroy(struct be_adapter *adapter)