From 93a49a31e986adb4334b689dc1762c078c28c8c9 Mon Sep 17 00:00:00 2001
From: Marc Dietrich <marvin24@gmx.de>
Date: Tue, 27 Sep 2011 19:01:08 +0200
Subject: [PATCH] --- yaml --- r: 268585 b: refs/heads/master c:
 9feeb0147fe6ae3158db5f319faded5e763744f9 h: refs/heads/master i:   268583:
 596e4259e642786363395cf755c060af9f971c47 v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/staging/nvec/nvec.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 133f3d10dafe..42e5cc5272cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de839b8f06bc5dd3f5037c4409a720cbb9bf21c3
+refs/heads/master: 9feeb0147fe6ae3158db5f319faded5e763744f9
diff --git a/trunk/drivers/staging/nvec/nvec.c b/trunk/drivers/staging/nvec/nvec.c
index 07c8e0952a24..fb0f0959eafa 100644
--- a/trunk/drivers/staging/nvec/nvec.c
+++ b/trunk/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;