Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

[deliverable/linux.git] / drivers / acpi / acpica / dbdisply.c

diff --git a/drivers/acpi/acpica/dbdisply.c b/drivers/acpi/acpica/dbdisply.c
index 1965b48d8e833e42cf3fe2fd74b4c91ecdd93599..502bb587f1128a8a2e37194aed9e581be29f3f99 100644 (file)
--- a/drivers/acpi/acpica/dbdisply.c
+++ b/drivers/acpi/acpica/dbdisply.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -599,12 +599,14 @@ void acpi_db_display_calling_tree(void)
 
 void acpi_db_display_object_type(char *object_arg)
 {
+       acpi_size arg;
        acpi_handle handle;
        struct acpi_device_info *info;
        acpi_status status;
        u32 i;
 
-       handle = ACPI_TO_POINTER(strtoul(object_arg, NULL, 16));
+       arg = strtoul(object_arg, NULL, 16);
+       handle = ACPI_TO_POINTER(arg);
 
        status = acpi_get_object_info(handle, &info);
        if (ACPI_FAILURE(status)) {