Skip to content

Commit

Permalink
Merge branch 'acpi-pnp'
Browse files Browse the repository at this point in the history
* acpi-pnp:
  ACPI / PNP: Replace faulty is_hex_digit() by isxdigit()
  ACPI / PNP: Fix acpi_pnp_match()
  • Loading branch information
Rafael J. Wysocki committed Aug 5, 2014
2 parents 8b80c0f + a5f95da commit bf74dc0
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions drivers/acpi/acpi_pnp.c
Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@

#include <linux/acpi.h>
#include <linux/module.h>
#include <linux/ctype.h>

static const struct acpi_device_id acpi_pnp_device_ids[] = {
/* soc_button_array */
@@ -320,11 +321,6 @@ static const struct acpi_device_id acpi_pnp_device_ids[] = {
{""},
};

static bool is_hex_digit(char c)
{
return (c >= 0 && c <= '9') || (c >= 'A' && c <= 'F');
}

static bool matching_id(char *idstr, char *list_id)
{
int i;
@@ -335,7 +331,7 @@ static bool matching_id(char *idstr, char *list_id)
for (i = 3; i < 7; i++) {
char c = toupper(idstr[i]);

if (!is_hex_digit(c)
if (!isxdigit(c)
|| (list_id[i] != 'X' && c != toupper(list_id[i])))
return false;
}

0 comments on commit bf74dc0

Please sign in to comment.