From aa65dc03afde49442c962b1df67963770b964dbd Mon Sep 17 00:00:00 2001
From: Alexander Shishkin <virtuoso@slind.org>
Date: Wed, 4 Aug 2010 11:27:33 +0100
Subject: [PATCH] --- yaml --- r: 208574 b: refs/heads/master c:
 988257cfcbc468cb26b3addfcab1d0187c4e2399 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/arch/arm/kernel/etm.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9080a06e5ebe..3d01a676984f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e354ea8e0710baf05804168fdabe90231b3d363
+refs/heads/master: 988257cfcbc468cb26b3addfcab1d0187c4e2399
diff --git a/trunk/arch/arm/kernel/etm.c b/trunk/arch/arm/kernel/etm.c
index 9e9db63c298a..56418f98cd01 100644
--- a/trunk/arch/arm/kernel/etm.c
+++ b/trunk/arch/arm/kernel/etm.c
@@ -543,7 +543,9 @@ static int __init etm_probe(struct amba_device *dev, struct amba_id *id)
 	t->etm_portsz = 1;
 
 	etm_unlock(t);
-	ret = etm_readl(t, ETMMR_PDSR);
+	(void)etm_readl(t, ETMMR_PDSR);
+	/* dummy first read */
+	(void)etm_readl(&tracer, ETMMR_OSSRR);
 
 	t->ncmppairs = etm_readl(t, ETMR_CONFCODE) & 0xf;
 	etm_writel(t, 0x440, ETMR_CTRL);