platform/x86: silead_dmi - do not treat all devices as i2c_clients

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 <dmitry.torokhov@gmail.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
[andy: simplified silead_ts_dmi_add_props() change]
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

diff --git a/drivers/platform/x86/silead_dmi.c b/drivers/platform/x86/silead_dmi.c
index 26b388db565ad7599332273e657cdae4bf152d6f..7564cc6529e7a052c602919ce4fb365df819502a 100644 (file)
--- a/drivers/platform/x86/silead_dmi.c
+++ b/drivers/platform/x86/silead_dmi.c
@@ -96,9 +96,9 @@ 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);
+       struct device *dev = &client->dev;
        const struct dmi_system_id *dmi_id;
        const struct silead_ts_dmi_data *ts_data;
        int error;
@@ -120,10 +120,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: