diff options
author | Jeffery Yu <jefferyy@nvidia.com> | 2017-05-16 17:46:48 +0200 |
---|---|---|
committer | Benson Leung <bleung@chromium.org> | 2017-06-23 16:12:19 -0700 |
commit | 995c0ec9a81f9e4e75f280f095534f4ed1a9ea9d (patch) | |
tree | 4a11cb647115dfe7aa23de36d0a0733139094939 /drivers/platform/chrome/cros_ec_dev.c | |
parent | abbb054d53266bfbd45ca9f2ba6522e3fd5b7f86 (diff) |
platform/chrome: cros_ec_lightbar - Avoid I2C xfer to EC during suspend
A Mutex lock in cros_ec_cmd_xfer which may be held by frozen
Userspace thread during system suspending. So should not
call this routine in suspend thread.
Signed-off-by: Jeffery Yu <jefferyy@nvidia.com>
Signed-off-by: Guenter Roeck <groeck@chromium.org>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Signed-off-by: Benson Leung <bleung@chromium.org>
Diffstat (limited to 'drivers/platform/chrome/cros_ec_dev.c')
-rw-r--r-- | drivers/platform/chrome/cros_ec_dev.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/platform/chrome/cros_ec_dev.c b/drivers/platform/chrome/cros_ec_dev.c index 7c2622319211..b9bf086f7569 100644 --- a/drivers/platform/chrome/cros_ec_dev.c +++ b/drivers/platform/chrome/cros_ec_dev.c @@ -437,8 +437,7 @@ static int ec_device_probe(struct platform_device *pdev) cros_ec_sensors_register(ec); /* Take control of the lightbar from the EC. */ - if (ec_has_lightbar(ec)) - lb_manual_suspend_ctrl(ec, 1); + lb_manual_suspend_ctrl(ec, 1); return 0; @@ -452,8 +451,7 @@ static int ec_device_remove(struct platform_device *pdev) struct cros_ec_dev *ec = dev_get_drvdata(&pdev->dev); /* Let the EC take over the lightbar again. */ - if (ec_has_lightbar(ec)) - lb_manual_suspend_ctrl(ec, 0); + lb_manual_suspend_ctrl(ec, 0); cros_ec_debugfs_remove(ec); @@ -472,8 +470,7 @@ static int ec_device_suspend(struct device *dev) { struct cros_ec_dev *ec = dev_get_drvdata(dev); - if (ec_has_lightbar(ec)) - lb_suspend(ec); + lb_suspend(ec); return 0; } @@ -482,8 +479,7 @@ static int ec_device_resume(struct device *dev) { struct cros_ec_dev *ec = dev_get_drvdata(dev); - if (ec_has_lightbar(ec)) - lb_resume(ec); + lb_resume(ec); return 0; } |