From: Marc Dietrich Date: Tue, 27 Sep 2011 17:01:08 +0000 (+0200) Subject: staging: nvec: send suspend messages synchronously X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9feeb0147fe6ae3158db5f319faded5e763744f9;p=mv-sheeva.git staging: nvec: send suspend messages synchronously The suspend commands need to be sent using the synchronous method, otherwise the power gets disabled before the messages are transferred. Signed-off-by: Marc Dietrich [jak@jak-linux.org: Rewrote commit message] Signed-off-by: Julian Andres Klode Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c index 07c8e0952a2..fb0f0959eaf 100644 --- a/drivers/staging/nvec/nvec.c +++ b/drivers/staging/nvec/nvec.c @@ -861,10 +861,16 @@ static int __devexit tegra_nvec_remove(struct platform_device *pdev) static int tegra_nvec_suspend(struct platform_device *pdev, pm_message_t state) { struct nvec_chip *nvec = platform_get_drvdata(pdev); + struct nvec_msg *msg; dev_dbg(nvec->dev, "suspending\n"); - nvec_write_async(nvec, EC_DISABLE_EVENT_REPORTING, 3); - nvec_write_async(nvec, "\x04\x02", 2); + + /* keep these sync or you'll break suspend */ + msg = nvec_write_sync(nvec, EC_DISABLE_EVENT_REPORTING, 3); + nvec_msg_free(nvec, msg); + msg = nvec_write_sync(nvec, "\x04\x02", 2); + nvec_msg_free(nvec, msg); + nvec_disable_i2c_slave(nvec); return 0;