Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10a87fcf authored by Tobias Klauser's avatar Tobias Klauser Committed by Jeff Garzik
Browse files

[PATCH] drivers/net/tulip/winbond-840: Use the DMA_32BIT_MASK constant 


  
  The previous patch did not compile cleanly on all architectures so
  here's a fixed one.
  
  Use the DMA_32BIT_MASK constant from dma-mapping.h when calling
  pci_set_dma_mask() or pci_set_consistent_dma_mask()
  
  Signed-off-by: default avatarTobias Klauser <tklauser@nuerscht.ch>
  Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent cb199d42

drivers/net/tulip/winbond-840.c

+2 −1
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; 
#include <linux/slab.h>

#include <linux/interrupt.h>

#include <linux/pci.h>

#include <linux/dma-mapping.h>

#include <linux/netdevice.h>

#include <linux/etherdevice.h>

#include <linux/skbuff.h>
@@ -394,7 +395,7 @@ static int __devinit w840_probe1 (struct pci_dev *pdev, 


	irq = pdev->irq;



	if (pci_set_dma_mask(pdev,0xFFFFffff)) {

	if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {

		printk(KERN_WARNING "Winbond-840: Device %s disabled due to DMA limitations.\n",

		       pci_name(pdev));

		return -EIO;