diff options
author | Alex Shi <alex.shi@linaro.org> | 2015-03-19 08:57:07 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2015-03-19 08:57:07 +0800 |
commit | 42f45c9abdea541a9f966553b5e71dd576d432f9 (patch) | |
tree | e9189f804b03d19696b0944a5a34ea9427177646 /drivers/acpi | |
parent | 4d8fd56f051e5eea61209de4a3cb0619283a30af (diff) | |
parent | ba0bfedf4c9cad58f56a7038d1462ffc21cd33df (diff) |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-androidlsk-v3.10-15.03-androidlinux-linaro-lsk-v3.10-android
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/video.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 82a01cc45f9c..0dc9ff61d7c2 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -1953,6 +1953,17 @@ EXPORT_SYMBOL(acpi_video_unregister); static int __init acpi_video_init(void) { + /* + * Let the module load even if ACPI is disabled (e.g. due to + * a broken BIOS) so that i915.ko can still be loaded on such + * old systems without an AcpiOpRegion. + * + * acpi_video_register() will report -ENODEV later as well due + * to acpi_disabled when i915.ko tries to register itself afterwards. + */ + if (acpi_disabled) + return 0; + dmi_check_system(video_dmi_table); if (intel_opregion_present()) |