diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:27:29 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:27:29 -0400 |
| commit | 5ce001b0e56638c726270d4f9e05d46d4250dfbb (patch) | |
| tree | c21cf007ddef99d5e8b23dde9621bd9152e676a8 /drivers/net/wireless/rt2x00/rt2x00pci.c | |
| parent | 7c9f8861e6c9c839f913e49b98c3854daca18f27 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into stackprotector
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00pci.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00pci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c index 971af2546b59..60893de3bf8f 100644 --- a/drivers/net/wireless/rt2x00/rt2x00pci.c +++ b/drivers/net/wireless/rt2x00/rt2x00pci.c | |||
| @@ -412,8 +412,7 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct pci_device_id *id) | |||
| 412 | if (pci_set_mwi(pci_dev)) | 412 | if (pci_set_mwi(pci_dev)) |
| 413 | ERROR_PROBE("MWI not available.\n"); | 413 | ERROR_PROBE("MWI not available.\n"); |
| 414 | 414 | ||
| 415 | if (pci_set_dma_mask(pci_dev, DMA_64BIT_MASK) && | 415 | if (pci_set_dma_mask(pci_dev, DMA_32BIT_MASK)) { |
| 416 | pci_set_dma_mask(pci_dev, DMA_32BIT_MASK)) { | ||
| 417 | ERROR_PROBE("PCI DMA not supported.\n"); | 416 | ERROR_PROBE("PCI DMA not supported.\n"); |
| 418 | retval = -EIO; | 417 | retval = -EIO; |
| 419 | goto exit_disable_device; | 418 | goto exit_disable_device; |