Date: Mon, 22 Dec 2003 07:57:10 +0000 From: Linux Kernel Mailing List To: bk-commits-24@vger.kernel.org Subject: [TG3]: Fix bogus return value in tg3_init_one(). ChangeSet 1.1136.81.7, 2003/12/21 23:57:10-08:00, romieu@fr.zoreil.com [TG3]: Fix bogus return value in tg3_init_one(). # This patch includes the following deltas: # ChangeSet 1.1136.81.6 -> 1.1136.81.7 # drivers/net/tg3.c 1.109 -> 1.110 # tg3.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletion(-) --- linux-2.4.23/drivers/net/tg3.c.orig 2003-11-28 11:26:20.000000000 -0700 +++ linux-2.4.23/drivers/net/tg3.c 2004-01-06 00:45:47.355119861 -0700 @@ -7526,11 +7526,13 @@ if (pm_cap == 0) { printk(KERN_ERR PFX "Cannot find PowerManagement capability, " "aborting.\n"); + err = -EIO; goto err_out_free_res; } /* Configure DMA attributes. */ - if (!pci_set_dma_mask(pdev, 0xffffffffffffffffULL)) { + err = pci_set_dma_mask(pdev, 0xffffffffffffffffULL); + if (!err) { pci_using_dac = 1; } else { err = pci_set_dma_mask(pdev, 0xffffffffULL);