diff --git a/[refs] b/[refs]
index 60c528be58eb..e196ba5ef4b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf83de4037780b11b27f1e32e33c1e8e7e42602e
+refs/heads/master: 1a86fbc167fdf8ac387a52d49782d7a5bc1d9ac9
diff --git a/trunk/arch/arm/mach-msm/smd.c b/trunk/arch/arm/mach-msm/smd.c
index 130b7a72bea1..2e32d9ab3609 100644
--- a/trunk/arch/arm/mach-msm/smd.c
+++ b/trunk/arch/arm/mach-msm/smd.c
@@ -872,9 +872,9 @@ static irqreturn_t smsm_irq_handler(int irq, void *data)
 int smsm_change_state(enum smsm_state_item item,
 		      uint32_t clear_mask, uint32_t set_mask)
 {
+	unsigned long addr = smd_info.state + item * 4;
 	unsigned long flags;
 	unsigned state;
-	unsigned addr = smd_info.state + item * 4;
 
 	if (!smd_info.ready)
 		return -EIO;