1 files changed, 12 insertions, 0 deletions

diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c
index 78ca994e6254..cf71c33ac2b2 100644
--- a/drivers/hid/i2c-hid/i2c-hid.c
+++ b/drivers/hid/i2c-hid/i2c-hid.c
@@ -863,6 +863,15 @@ static int i2c_hid_fetch_hid_descriptor(struct i2c_hid *ihid)
 }
 
 #ifdef CONFIG_ACPI
+static const struct acpi_device_id i2c_hid_acpi_blacklist[] = {
+        /*
+         * The CHPN0001 ACPI device, which is used to describe the Chipone
+         * ICN8505 controller, has a _CID of PNP0C50 but is not HID compatible.
+         */
+        {"CHPN0001", 0 },
+        { },
+};
+
 static int i2c_hid_acpi_pdata(struct i2c_client *client,
                 struct i2c_hid_platform_data *pdata)
 {
@@ -879,6 +888,9 @@ static int i2c_hid_acpi_pdata(struct i2c_client *client,
                 return -ENODEV;
         }
 
+        if (acpi_match_device_ids(adev, i2c_hid_acpi_blacklist) == 0)
+                return -ENODEV;
+
         obj = acpi_evaluate_dsm_typed(handle, &i2c_hid_guid, 1, 1, NULL,
                                       ACPI_TYPE_INTEGER);
         if (!obj) {