diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-12-07 17:14:35 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-12-07 17:14:35 -0500 |
| commit | 1a14f30b36e5d20a2a1be24888c2158541d97bab (patch) | |
| tree | 790531441ea86f7873d3d2874f33eeb5c1f2e938 /drivers/pnp | |
| parent | 583bdc59820692eead7868e816d08bee4c55c1c6 (diff) | |
| parent | cdc87c5a30f407ed1ce43d8a22261116873d5ef1 (diff) | |
Merge branch 'acpi-general'
* acpi-general:
pnpacpi: fix incorrect TEST_ALPHA() test
ACPI / video: ignore BIOS initial backlight value for HP Folio 13-2000
ACPI : do not use Lid and Sleep button for S5 wakeup
Diffstat (limited to 'drivers/pnp')
| -rw-r--r-- | drivers/pnp/pnpacpi/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c index 93a16ee14a9f..72e822e17d47 100644 --- a/drivers/pnp/pnpacpi/core.c +++ b/drivers/pnp/pnpacpi/core.c | |||
| @@ -58,7 +58,7 @@ static inline int __init is_exclusive_device(struct acpi_device *dev) | |||
| 58 | if (!(('0' <= (c) && (c) <= '9') || ('A' <= (c) && (c) <= 'F'))) \ | 58 | if (!(('0' <= (c) && (c) <= '9') || ('A' <= (c) && (c) <= 'F'))) \ |
| 59 | return 0 | 59 | return 0 |
| 60 | #define TEST_ALPHA(c) \ | 60 | #define TEST_ALPHA(c) \ |
| 61 | if (!('@' <= (c) || (c) <= 'Z')) \ | 61 | if (!('A' <= (c) && (c) <= 'Z')) \ |
| 62 | return 0 | 62 | return 0 |
| 63 | static int __init ispnpidacpi(const char *id) | 63 | static int __init ispnpidacpi(const char *id) |
| 64 | { | 64 | { |