p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'acpi-pnp' 

* acpi-pnp:
  ACPI / PNP: Replace faulty is_hex_digit() by isxdigit()
  ACPI / PNP: Fix acpi_pnp_match()
This commit is contained in:
Rafael J. Wysocki 2014-08-05 22:50:27 +02:00
parent 8b80c0f187 a5f95da9fb
commit bf74dc001c
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/acpi/acpi_pnp.c
View File

@ -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;
}