staging: rtl8188eu: using unique names is good

[karo-tx-linux.git] / drivers / acpi / osl.c

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index bad25b070fe0bfe8b0204cce2ddd5ce30f07ec91..3abe9b223ba717a644ecfd0a4edf401004f24807 100644 (file)
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -259,12 +259,14 @@ acpi_physical_address __init acpi_os_get_root_pointer(void)
                               "System description tables not found\n");
                        return 0;
                }
-       } else {
+       } else if (IS_ENABLED(CONFIG_ACPI_LEGACY_TABLES_LOOKUP)) {
                acpi_physical_address pa = 0;
 
                acpi_find_root_pointer(&pa);
                return pa;
        }
+
+       return 0;
 }
 
 /* Must be called with 'acpi_ioremap_lock' or RCU read lock held. */