summaryrefslogtreecommitdiff
path: root/drivers/pnp
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2012-12-08 02:14:35 +0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2012-12-08 02:14:35 +0400
commit1a14f30b36e5d20a2a1be24888c2158541d97bab (patch)
tree790531441ea86f7873d3d2874f33eeb5c1f2e938 /drivers/pnp
parent583bdc59820692eead7868e816d08bee4c55c1c6 (diff)
parentcdc87c5a30f407ed1ce43d8a22261116873d5ef1 (diff)
downloadlinux-1a14f30b36e5d20a2a1be24888c2158541d97bab.tar.xz
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.c2
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)
if (!(('0' <= (c) && (c) <= '9') || ('A' <= (c) && (c) <= 'F'))) \
return 0
#define TEST_ALPHA(c) \
- if (!('@' <= (c) || (c) <= 'Z')) \
+ if (!('A' <= (c) && (c) <= 'Z')) \
return 0
static int __init ispnpidacpi(const char *id)
{