mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-28 16:43:09 +00:00
Code Issues Releases Activity

Cope with errors from device_get_children(). These errors can happen

Browse Source 
only in low memory situations, so the error fork of these fixes is
lightly tested, but they should do the least-wrong thing...

Submitted by:	Hans Petter Selasky
This commit is contained in:
Warner Losh 2008-08-23 07:23:52 +00:00
parent de5d443f0f
commit 696771ee0a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=182033
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/dev/pci/pci.c
View File

@ -2663,7 +2663,8 @@ pci_suspend(device_t dev)
acpi_dev = NULL;
if (pci_do_power_resume)
acpi_dev = devclass_get_device(devclass_find("acpi"), 0);
device_get_children(dev, &devlist, &numdevs);
if ((error = device_get_children(dev, &devlist, &numdevs)) != 0)
return (error);
for (i = 0; i < numdevs; i++) {
child = devlist[i];
dinfo = (struct pci_devinfo *) device_get_ivars(child);
@ -2700,7 +2701,7 @@ pci_suspend(device_t dev)
int
pci_resume(device_t dev)
{
int i, numdevs;
int i, numdevs, error;
device_t acpi_dev, child, *devlist;
struct pci_devinfo *dinfo;
@ -2710,7 +2711,8 @@ pci_resume(device_t dev)
acpi_dev = NULL;
if (pci_do_power_resume)
acpi_dev = devclass_get_device(devclass_find("acpi"), 0);
device_get_children(dev, &devlist, &numdevs);
if ((error = device_get_children(dev, &devlist, &numdevs)) != 0)
return (error);
for (i = 0; i < numdevs; i++) {
/*
* Notify ACPI we're going to D0 but ignore the result. If
@ -2759,7 +2761,8 @@ pci_driver_added(device_t dev, driver_t *driver)
if (bootverbose)
device_printf(dev, "driver added\n");
DEVICE_IDENTIFY(driver, dev);
device_get_children(dev, &devlist, &numdevs);
if (device_get_children(dev, &devlist, &numdevs) != 0)
return;
for (i = 0; i < numdevs; i++) {
child = devlist[i];
if (device_get_state(child) != DS_NOTPRESENT)