mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 16:49:22 +00:00
drivers/staging/wlags49_h2/wl_pci.c: add missing wl_device_dealloc and 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>
This commit is contained in:
parent
b9a62c650b
commit
3fb95e564e
1 changed files with 4 additions and 0 deletions
|
@ -524,6 +524,7 @@ int wl_pci_setup( struct pci_dev *pdev )
|
||||||
/* Make sure that space was allocated for our private adapter struct */
|
/* Make sure that space was allocated for our private adapter struct */
|
||||||
if( dev->priv == NULL ) {
|
if( dev->priv == NULL ) {
|
||||||
DBG_ERROR( DbgInfo, "Private adapter struct was not allocated!!!\n" );
|
DBG_ERROR( DbgInfo, "Private adapter struct was not allocated!!!\n" );
|
||||||
|
wl_device_dealloc(dev);
|
||||||
DBG_LEAVE( DbgInfo );
|
DBG_LEAVE( DbgInfo );
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
@ -532,6 +533,7 @@ int wl_pci_setup( struct pci_dev *pdev )
|
||||||
/* Allocate DMA Descriptors */
|
/* Allocate DMA Descriptors */
|
||||||
if( wl_pci_dma_alloc( pdev, dev->priv ) < 0 ) {
|
if( wl_pci_dma_alloc( pdev, dev->priv ) < 0 ) {
|
||||||
DBG_ERROR( DbgInfo, "Could not allocate DMA descriptor memory!!!\n" );
|
DBG_ERROR( DbgInfo, "Could not allocate DMA descriptor memory!!!\n" );
|
||||||
|
wl_device_dealloc(dev);
|
||||||
DBG_LEAVE( DbgInfo );
|
DBG_LEAVE( DbgInfo );
|
||||||
return -ENOMEM;
|
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);
|
result = request_irq(dev->irq, wl_isr, SA_SHIRQ, dev->name, dev);
|
||||||
if( result ) {
|
if( result ) {
|
||||||
DBG_WARNING( DbgInfo, "Could not register ISR!!!\n" );
|
DBG_WARNING( DbgInfo, "Could not register ISR!!!\n" );
|
||||||
|
wl_remove(dev);
|
||||||
|
wl_device_dealloc(dev);
|
||||||
DBG_LEAVE( DbgInfo );
|
DBG_LEAVE( DbgInfo );
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue