forked from luck/tmp_suning_uos_patched
[PATCH] PCI: pci_find_device remove (sparc64/kernel/ebus.c)
Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
619daa2e4c
commit
d08fa1a22e
|
@ -527,18 +527,12 @@ static struct pci_dev *find_next_ebus(struct pci_dev *start, int *is_rio_p)
|
|||
{
|
||||
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();
|
||||
|
|
Loading…
Reference in New Issue
Block a user