diff --git a/[refs] b/[refs] index b4ec245e9cf8..0fd6f6f2a814 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49bd136f93fe503c968ca95247dff9869324f484 +refs/heads/master: 5375819d83e54666e4552d1dab87ca6ce44c4600 diff --git a/trunk/drivers/staging/rtl8187se/r8180_core.c b/trunk/drivers/staging/rtl8187se/r8180_core.c index 7d8f9910c875..4d103495dc0c 100644 --- a/trunk/drivers/staging/rtl8187se/r8180_core.c +++ b/trunk/drivers/staging/rtl8187se/r8180_core.c @@ -713,8 +713,8 @@ void rtl8180_rtx_disable(struct net_device *dev) struct r8180_priv *priv = ieee80211_priv(dev); cmd = read_nic_byte(dev, CMD); - write_nic_byte(dev, CMD, cmd & ~\ - ((1<pdev, priv->rxbuffer->dma, - priv->rxbuffersize * \ - sizeof(u8), + priv->rxbuffersize * sizeof(u8), PCI_DMA_FROMDEVICE); first = *(priv->rxringtail) & (1<<29) ? 1 : 0; @@ -1490,8 +1489,7 @@ void rtl8180_rx(struct net_device *dev) pci_dma_sync_single_for_device(priv->pdev, priv->rxbuffer->dma, - priv->rxbuffersize * \ - sizeof(u8), + priv->rxbuffersize * sizeof(u8), PCI_DMA_FROMDEVICE); drop: /* this is used when we have not enough mem */