---

yaml --- r: 287773 b: refs/heads/master c: 46e33c6 h: refs/heads/master i: 287771: eb79758 v: v3
git-mirror · Feb 15, 2012 · e9fc574 · e9fc574
1 parent 237bb5a
commit e9fc574
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4272f98a1ae81709fc5c804c33c044064e419cd9
+refs/heads/master: 46e33c606af8e0caeeca374103189663d877c0d6
diff --git a/trunk/arch/arm/common/pl330.c b/trunk/arch/arm/common/pl330.c
@@ -1502,12 +1502,13 @@ int pl330_chan_ctrl(void *ch_id, enum pl330_chan_op op)
 	struct pl330_thread *thrd = ch_id;
 	struct pl330_dmac *pl330;
 	unsigned long flags;
-	int ret = 0, active = thrd->req_running;
+	int ret = 0, active;
 
 	if (!thrd || thrd->free || thrd->dmac->state == DYING)
 		return -EINVAL;
 
 	pl330 = thrd->dmac;
+	active = thrd->req_running;
 
 	spin_lock_irqsave(&pl330->lock, flags);