From 1dc0e8d54a919f91f3b502fbbc9c80729edc6d23 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 21 Mar 2006 10:57:02 -0800 Subject: [PATCH] --- yaml --- r: 22347 b: refs/heads/master c: 93aea718c69d44ee492f233929686b15b5b3702d h: refs/heads/master i: 22345: 570e52bef88bc75fd29d1820fe6910296ba230f9 22343: ff4ad57663378fe85dafb888258f7cc2d8a72be4 v: v3 --- [refs] | 2 +- trunk/drivers/net/skge.c | 24 ++++++++++-------------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 1abea7643b29..2308ba531aaf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3da14474063e71686039d961d14785a9c2971ae +refs/heads/master: 93aea718c69d44ee492f233929686b15b5b3702d diff --git a/trunk/drivers/net/skge.c b/trunk/drivers/net/skge.c index deca5066a447..381669cc415f 100644 --- a/trunk/drivers/net/skge.c +++ b/trunk/drivers/net/skge.c @@ -3251,22 +3251,18 @@ static int __devinit skge_probe(struct pci_dev *pdev, pci_set_master(pdev); - if (sizeof(dma_addr_t) > sizeof(u32) && - !(err = pci_set_dma_mask(pdev, DMA_64BIT_MASK))) { + if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) { using_dac = 1; err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK); - if (err < 0) { - printk(KERN_ERR PFX "%s unable to obtain 64 bit DMA " - "for consistent allocations\n", pci_name(pdev)); - goto err_out_free_regions; - } - } else { - err = pci_set_dma_mask(pdev, DMA_32BIT_MASK); - if (err) { - printk(KERN_ERR PFX "%s no usable DMA configuration\n", - pci_name(pdev)); - goto err_out_free_regions; - } + } else if (!(err = pci_set_dma_mask(pdev, DMA_32BIT_MASK))) { + using_dac = 0; + err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); + } + + if (err) { + printk(KERN_ERR PFX "%s no usable DMA configuration\n", + pci_name(pdev)); + goto err_out_free_regions; } #ifdef __BIG_ENDIAN