From: Jiri Slaby <jirislaby@gmail.com>
Generated in 2.6.13-rc6-mm2 kernel version.
Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
arch/sparc64/kernel/ebus.c | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff -puN arch/sparc64/kernel/ebus.c~arch-pci_find_device-remove-sparc64-kernel-ebusc arch/sparc64/kernel/ebus.c
--- 25/arch/sparc64/kernel/ebus.c~arch-pci_find_device-remove-sparc64-kernel-ebusc Thu Sep 1 14:33:57 2005
+++ 25-akpm/arch/sparc64/kernel/ebus.c Thu Sep 1 14:33:57 2005
@@ -527,18 +527,12 @@ static struct pci_dev *find_next_ebus(st
{
struct pci_dev *pdev = start;
- do {
- pdev = pci_find_device(PCI_VENDOR_ID_SUN, PCI_ANY_ID, pdev);
- if (pdev &&
- (pdev->device == PCI_DEVICE_ID_SUN_EBUS ||
- pdev->device == PCI_DEVICE_ID_SUN_RIO_EBUS))
+ while (pdev = pci_get_device(PCI_VENDOR_ID_SUN, PCI_ANY_ID, pdev))
+ if (pdev->device == PCI_DEVICE_ID_SUN_EBUS ||
+ pdev->device == PCI_DEVICE_ID_SUN_RIO_EBUS)
break;
- } while (pdev != NULL);
- if (pdev && (pdev->device == PCI_DEVICE_ID_SUN_RIO_EBUS))
- *is_rio_p = 1;
- else
- *is_rio_p = 0;
+ *is_rio_p = !!(pdev && (pdev->device == PCI_DEVICE_ID_SUN_RIO_EBUS));
return pdev;
}
@@ -637,6 +631,7 @@ void __init ebus_init(void)
ebus->is_rio = is_rio;
++num_ebus;
}
+ pci_dev_put(pdev); /* XXX for the case, when ebusnd is 0, is it OK? */
#ifdef CONFIG_SUN_AUXIO
auxio_probe();
_