Re: [KJ] [RFT 2.6] ebus.c replace pci_find_device with pci_get_device

[Hanna Linder]

--On Saturday, October 09, 2004 10:13:28 AM -0700 Scott Feldman <sfeldma@xxxxxxxxx> wrote:
> If we can get out of the while() with pdev != NULL, then a
> pci_dev_put(pdev) cleanup is required.  
> 
> -scott

Here is the new patch. Thanks Scott.

Signed-off-by: Hanna Linder <hannal@xxxxxxxxxx>

diff -Nrup linux-2.6.9-rc4-mm1cln/arch/sparc/kernel/ebus.c linux-2.6.9-rc4-mm1patch/arch/sparc/kernel/ebus.c
--- linux-2.6.9-rc4-mm1cln/arch/sparc/kernel/ebus.c	2004-10-12 14:15:31.000000000 -0700
+++ linux-2.6.9-rc4-mm1patch/arch/sparc/kernel/ebus.c	2004-10-12 14:53:55.369254888 -0700
@@ -275,7 +275,7 @@ void __init ebus_init(void)
 		}
 	}
 
-	pdev = pci_find_device(PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_EBUS, 0);
+	pdev = pci_get_device(PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_EBUS, 0);
 	if (!pdev) {
 		return;
 	}
@@ -342,7 +342,7 @@ void __init ebus_init(void)
 		}
 
 	next_ebus:
-		pdev = pci_find_device(PCI_VENDOR_ID_SUN,
+		pdev = pci_get_device(PCI_VENDOR_ID_SUN,
 				       PCI_DEVICE_ID_SUN_EBUS, pdev);
 		if (!pdev)
 			break;
@@ -356,4 +356,6 @@ void __init ebus_init(void)
 		ebus->next = 0;
 		++num_ebus;
 	}
+	if(pdev)
+		pci_dev_put(pdev);
 }

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/