Pull trivial into test branch

Conflicts:

	drivers/acpi/ec.c

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;