From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752527AbdDDDZT (ORCPT ); Mon, 3 Apr 2017 23:25:19 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:35635 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751406AbdDDDZR (ORCPT ); Mon, 3 Apr 2017 23:25:17 -0400 From: Dmitry Torokhov To: Hans de Goede Cc: Darren Hart , Andy Shevchenko , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] platform/x86: silead_dmi - do not treat all devices as i2c_clients Date: Mon, 3 Apr 2017 20:25:13 -0700 Message-Id: <20170404032514.31832-1-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.12.2.715.g7642488e1d-goog Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I2C bus has both i2c clients and adapter devices, so we must be careful in notifier code and verify that we are actually dealing with an i2c client before using it as such. Fixes: cef9dd85acd7 ("platform/x86: add support for devices with Silead...") Signed-off-by: Dmitry Torokhov --- drivers/platform/x86/silead_dmi.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/platform/x86/silead_dmi.c b/drivers/platform/x86/silead_dmi.c index 02e11fdbf375..7f1049951d1c 100644 --- a/drivers/platform/x86/silead_dmi.c +++ b/drivers/platform/x86/silead_dmi.c @@ -75,9 +75,8 @@ static const struct dmi_system_id silead_ts_dmi_table[] = { { }, }; -static void silead_ts_dmi_add_props(struct device *dev) +static void silead_ts_dmi_add_props(struct i2c_client *client) { - struct i2c_client *client = to_i2c_client(dev); const struct dmi_system_id *dmi_id; const struct silead_ts_dmi_data *ts_data; int error; @@ -87,11 +86,13 @@ static void silead_ts_dmi_add_props(struct device *dev) return; ts_data = dmi_id->driver_data; - if (has_acpi_companion(dev) && + if (has_acpi_companion(&client->dev) && !strncmp(ts_data->acpi_name, client->name, I2C_NAME_SIZE)) { - error = device_add_properties(dev, ts_data->properties); + error = device_add_properties(&client->dev, + ts_data->properties); if (error) - dev_err(dev, "failed to add properties: %d\n", error); + dev_err(&client->dev, + "failed to add properties: %d\n", error); } } @@ -99,10 +100,13 @@ static int silead_ts_dmi_notifier_call(struct notifier_block *nb, unsigned long action, void *data) { struct device *dev = data; + struct i2c_client *client; switch (action) { case BUS_NOTIFY_ADD_DEVICE: - silead_ts_dmi_add_props(dev); + client = i2c_verify_client(dev); + if (client) + silead_ts_dmi_add_props(client); break; default: -- 2.12.2.715.g7642488e1d-goog