Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 205840
b: refs/heads/master
c: 2f72aee
h: refs/heads/master
v: v3
  • Loading branch information
Kulikov Vasiliy authored and Greg Kroah-Hartman committed Jul 8, 2010
1 parent ce47e17 commit 8d2aceb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 82942ca2b509f4a77ef1febd00f648fcb67950ca
refs/heads/master: 2f72aee1896bafa0fbf0ef2cdc3babe399057a11
6 changes: 3 additions & 3 deletions trunk/drivers/staging/wlags49_h2/wl_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ void __devexit wl_pci_remove(struct pci_dev *pdev)
free_irq( dev->irq, dev );

#ifdef ENABLE_DMA
wl_pci_dma_free( pdev, (struct wl_private *)dev->priv );
wl_pci_dma_free( pdev, dev->priv );
#endif

wl_device_dealloc( dev );
Expand Down Expand Up @@ -534,7 +534,7 @@ int wl_pci_setup( struct pci_dev *pdev )

#ifdef ENABLE_DMA
/* Allocate DMA Descriptors */
if( wl_pci_dma_alloc( pdev, (struct wl_private *)dev->priv ) < 0 ) {
if( wl_pci_dma_alloc( pdev, dev->priv ) < 0 ) {
DBG_ERROR( DbgInfo, "Could not allocate DMA descriptor memory!!!\n" );
DBG_LEAVE( DbgInfo );
return -ENOMEM;
Expand Down Expand Up @@ -570,7 +570,7 @@ int wl_pci_setup( struct pci_dev *pdev )
}

/* Make sure interrupts are enabled properly for CardBus */
lp = (struct wl_private *)dev->priv;
lp = dev->priv;

if( lp->hcfCtx.IFB_BusType == CFG_NIC_BUS_TYPE_CARDBUS ||
lp->hcfCtx.IFB_BusType == CFG_NIC_BUS_TYPE_PCI ) {
Expand Down

0 comments on commit 8d2aceb

Please sign in to comment.