Skip to content

Commit

Permalink
drivers/staging/wlags49_h2/wl_pci.c: add missing wl_device_dealloc an…
Browse files Browse the repository at this point in the history
…d wl_remove

The need for wl_device_dealloc is motivated by the error-handling code for
the failure of wl_adapter_insert.  The need for wl_remove in the third case
is motivated by the code in the definition of wl_pci_remove.

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Julia Lawall authored and Greg Kroah-Hartman committed Apr 20, 2012
1 parent b9a62c6 commit 3fb95e5
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/staging/wlags49_h2/wl_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 3fb95e5

Please sign in to comment.