Merge tag 'mac80211-for-davem-2016-07-06' of git://git.kernel.org/pub/scm/linux/kerne...

[cascardo/linux.git] / drivers / platform / chrome / cros_ec_lightbar.c

diff --git a/drivers/platform/chrome/cros_ec_lightbar.c b/drivers/platform/chrome/cros_ec_lightbar.c
index ff76405..8df3d44 100644 (file)
--- a/drivers/platform/chrome/cros_ec_lightbar.c
+++ b/drivers/platform/chrome/cros_ec_lightbar.c
@@ -412,9 +412,13 @@ static umode_t cros_ec_lightbar_attrs_are_visible(struct kobject *kobj,
        struct device *dev = container_of(kobj, struct device, kobj);
        struct cros_ec_dev *ec = container_of(dev,
                                              struct cros_ec_dev, class_dev);
-       struct platform_device *pdev = container_of(ec->dev,
-                                                  struct platform_device, dev);
-       if (pdev->id != 0)
+       struct platform_device *pdev = to_platform_device(ec->dev);
+       struct cros_ec_platform *pdata = pdev->dev.platform_data;
+       int is_cros_ec;
+
+       is_cros_ec = strcmp(pdata->ec_name, CROS_EC_DEV_NAME);
+
+       if (is_cros_ec != 0)
                return 0;
 
        /* Only instantiate this stuff if the EC has a lightbar */