diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:05:23 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:05:23 -0400 |
| commit | 8560b9321f9050968f393ce1ec67e47c1a0bd5cf (patch) | |
| tree | 658ebb20e4fd5dee840f27103b59da367ff473b1 /drivers/net/benet/be_main.c | |
| parent | 72e31981a4e91f84c5b5e8994f5d25b1cf22b6cf (diff) | |
| parent | 6574612fbb34c63117581e68f2231ddce027e41e (diff) | |
Merge branch 'fix/asoc' into topic/asoc
Diffstat (limited to 'drivers/net/benet/be_main.c')
| -rw-r--r-- | drivers/net/benet/be_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index 9b75aa630062..30d0c81c989e 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c | |||
| @@ -1821,11 +1821,11 @@ static int __devinit be_probe(struct pci_dev *pdev, | |||
| 1821 | 1821 | ||
| 1822 | be_msix_enable(adapter); | 1822 | be_msix_enable(adapter); |
| 1823 | 1823 | ||
| 1824 | status = pci_set_dma_mask(pdev, DMA_64BIT_MASK); | 1824 | status = pci_set_dma_mask(pdev, DMA_BIT_MASK(64)); |
| 1825 | if (!status) { | 1825 | if (!status) { |
| 1826 | netdev->features |= NETIF_F_HIGHDMA; | 1826 | netdev->features |= NETIF_F_HIGHDMA; |
| 1827 | } else { | 1827 | } else { |
| 1828 | status = pci_set_dma_mask(pdev, DMA_32BIT_MASK); | 1828 | status = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); |
| 1829 | if (status) { | 1829 | if (status) { |
| 1830 | dev_err(&pdev->dev, "Could not set PCI DMA Mask\n"); | 1830 | dev_err(&pdev->dev, "Could not set PCI DMA Mask\n"); |
| 1831 | goto free_netdev; | 1831 | goto free_netdev; |