From 8d2aceb4f47f9df68bda9e9b9937e85064eec76c Mon Sep 17 00:00:00 2001 From: Kulikov Vasiliy Date: Tue, 29 Jun 2010 14:16:29 +0400 Subject: [PATCH] --- yaml --- r: 205840 b: refs/heads/master c: 2f72aee1896bafa0fbf0ef2cdc3babe399057a11 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/wlags49_h2/wl_pci.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c6036d2f5d89..354591c7a06d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82942ca2b509f4a77ef1febd00f648fcb67950ca +refs/heads/master: 2f72aee1896bafa0fbf0ef2cdc3babe399057a11 diff --git a/trunk/drivers/staging/wlags49_h2/wl_pci.c b/trunk/drivers/staging/wlags49_h2/wl_pci.c index 6751b4bad2e4..af4f4f80a002 100644 --- a/trunk/drivers/staging/wlags49_h2/wl_pci.c +++ b/trunk/drivers/staging/wlags49_h2/wl_pci.c @@ -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 ); @@ -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; @@ -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 ) {