From 8aa86f43eebb58062effbca33c9911cb2f0fd87d Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Tue, 28 Mar 2006 18:10:38 +0200 Subject: [PATCH] --- yaml --- r: 25689 b: refs/heads/master c: c91e468a48a2afd2a2b0c2e29a35d6b8c51ea682 h: refs/heads/master i: 25687: 3b1735fba3aa3e2c0da1a59ed8636b37240d8635 v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgb/ixgb_main.c | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b89a8b092d5f..e8c8ea1ba461 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43f2f10444c008296cc8de68a72fd87b33b50452 +refs/heads/master: c91e468a48a2afd2a2b0c2e29a35d6b8c51ea682 diff --git a/trunk/drivers/net/ixgb/ixgb_main.c b/trunk/drivers/net/ixgb/ixgb_main.c index f9f77e4f5965..cfd67d812f0d 100644 --- a/trunk/drivers/net/ixgb/ixgb_main.c +++ b/trunk/drivers/net/ixgb/ixgb_main.c @@ -357,18 +357,20 @@ ixgb_probe(struct pci_dev *pdev, if((err = pci_enable_device(pdev))) return err; - if(!(err = pci_set_dma_mask(pdev, DMA_64BIT_MASK))) { + if(!(err = pci_set_dma_mask(pdev, DMA_64BIT_MASK)) && + !(err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK))) { pci_using_dac = 1; } else { - if((err = pci_set_dma_mask(pdev, DMA_32BIT_MASK))) { + if((err = pci_set_dma_mask(pdev, DMA_32BIT_MASK)) || + (err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK))) { IXGB_ERR("No usable DMA configuration, aborting\n"); - return err; + goto err_dma_mask; } pci_using_dac = 0; } if((err = pci_request_regions(pdev, ixgb_driver_name))) - return err; + goto err_request_regions; pci_set_master(pdev); @@ -502,6 +504,9 @@ ixgb_probe(struct pci_dev *pdev, free_netdev(netdev); err_alloc_etherdev: pci_release_regions(pdev); +err_request_regions: +err_dma_mask: + pci_disable_device(pdev); return err; }