diff options
| author | Len Brown <len.brown@intel.com> | 2006-12-16 00:45:07 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-12-16 00:45:07 -0500 |
| commit | 463e7c7cf9aaf95dd05e97e1a47854fdf5454cdc (patch) | |
| tree | 1b9171c109496b7f4991fcae0a2e08ed3bbea10d /drivers/acpi/glue.c | |
| parent | 25c68a33b7b74b37793b1250007e5e21d621a7fc (diff) | |
| parent | 7d63c6759188b9b35c789159f6e02cd02d49ec7d (diff) | |
| download | linux-463e7c7cf9aaf95dd05e97e1a47854fdf5454cdc.tar.gz linux-463e7c7cf9aaf95dd05e97e1a47854fdf5454cdc.tar.bz2 linux-463e7c7cf9aaf95dd05e97e1a47854fdf5454cdc.zip | |
Pull trivial into test branch
Conflicts:
drivers/acpi/ec.c
Diffstat (limited to 'drivers/acpi/glue.c')
| -rw-r--r-- | drivers/acpi/glue.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c index a2f46d587d55..4ac2f18e0da2 100644 --- a/drivers/acpi/glue.c +++ b/drivers/acpi/glue.c @@ -189,8 +189,12 @@ find_pci_rootbridge(acpi_handle handle, u32 lvl, void *context, void **rv) bus = tmp; if (seg == find->seg && bus == find->bus) + { find->handle = handle; - status = AE_OK; + status = AE_CTRL_TERMINATE; + } + else + status = AE_OK; exit: kfree(buffer.pointer); return status; |