1 files changed, 7 insertions, 3 deletions

diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index a2f46d587d55..8a0324b43e53 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -96,7 +96,7 @@ struct acpi_find_pci_root {
 static acpi_status
 do_root_bridge_busnr_callback(struct acpi_resource *resource, void *data)
 {
-        unsigned long *busnr = (unsigned long *)data;
+        unsigned long *busnr = data;
         struct acpi_resource_address64 address;
 
         if (resource->type != ACPI_RESOURCE_TYPE_ADDRESS16 &&
@@ -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;
@@ -217,7 +221,7 @@ do_acpi_find_child(acpi_handle handle, u32 lvl, void *context, void **rv)
         acpi_status status;
         struct acpi_device_info *info;
         struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
-        struct acpi_find_child *find = (struct acpi_find_child *)context;
+        struct acpi_find_child *find = context;
 
         status = acpi_get_object_info(handle, &buffer);
         if (ACPI_SUCCESS(status)) {