diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-02 18:24:59 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-02 18:24:59 +0100 |
| commit | 744c62eb65a1c3bb2196ded1a1d2922cf6f2ce80 (patch) | |
| tree | e7c47e2e9aa8f6184cb5b20bde2e4fda96a3bb59 /drivers/acpi/video.c | |
| parent | f141822b15635daa94610c5527806fa315f59f4d (diff) | |
| parent | 6887a4131da3adaab011613776d865f4bcfb5678 (diff) | |
Merge tag 'v3.5-rc5' into regulator-drivers
Linux 3.5-rc5 collides with further development.
Conflicts:
drivers/regulator/tps65023-regulator.c
Diffstat (limited to 'drivers/acpi/video.c')
| -rw-r--r-- | drivers/acpi/video.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index a576575617d7..1e0a9e17c31d 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -558,6 +558,8 @@ acpi_video_bus_DOS(struct acpi_video_bus *video, int bios_flag, int lcd_flag) union acpi_object arg0 = { ACPI_TYPE_INTEGER }; struct acpi_object_list args = { 1, &arg0 }; + if (!video->cap._DOS) + return 0; if (bios_flag < 0 || bios_flag > 3 || lcd_flag < 0 || lcd_flag > 1) return -EINVAL; |