From a1f8c39cc5e0fbc74edc2628223107573475ce1a Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Thu, 19 Apr 2012 13:03:58 +0200 Subject: [PATCH] --- yaml --- r: 304395 b: refs/heads/master c: 3fb95e564e535a1614f7cea1ac194f312eb0d2b8 h: refs/heads/master i: 304393: 2b223409050c154ab320006c47fa540f1055cbc5 304391: a0ea19c9642b9d4d3e7826cb937a5f51aa470bd9 v: v3 --- [refs] | 2 +- trunk/drivers/staging/wlags49_h2/wl_pci.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8166556c73ae..38f72838ff20 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9a62c650b41365cd1f6214496bc91f152c723a4 +refs/heads/master: 3fb95e564e535a1614f7cea1ac194f312eb0d2b8 diff --git a/trunk/drivers/staging/wlags49_h2/wl_pci.c b/trunk/drivers/staging/wlags49_h2/wl_pci.c index 3df990c7306a..0b31b01bd490 100644 --- a/trunk/drivers/staging/wlags49_h2/wl_pci.c +++ b/trunk/drivers/staging/wlags49_h2/wl_pci.c @@ -524,6 +524,7 @@ int wl_pci_setup( struct pci_dev *pdev ) /* Make sure that space was allocated for our private adapter struct */ if( dev->priv == NULL ) { DBG_ERROR( DbgInfo, "Private adapter struct was not allocated!!!\n" ); + wl_device_dealloc(dev); DBG_LEAVE( DbgInfo ); return -ENOMEM; } @@ -532,6 +533,7 @@ int wl_pci_setup( struct pci_dev *pdev ) /* Allocate DMA Descriptors */ if( wl_pci_dma_alloc( pdev, dev->priv ) < 0 ) { DBG_ERROR( DbgInfo, "Could not allocate DMA descriptor memory!!!\n" ); + wl_device_dealloc(dev); DBG_LEAVE( DbgInfo ); return -ENOMEM; } @@ -561,6 +563,8 @@ int wl_pci_setup( struct pci_dev *pdev ) result = request_irq(dev->irq, wl_isr, SA_SHIRQ, dev->name, dev); if( result ) { DBG_WARNING( DbgInfo, "Could not register ISR!!!\n" ); + wl_remove(dev); + wl_device_dealloc(dev); DBG_LEAVE( DbgInfo ); return result; }