diff options
| author | Clark Williams <williams@redhat.com> | 2012-03-01 09:15:01 -0600 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-03-01 09:15:01 -0600 |
| commit | 5ee07f2a498e0a5f4a9994317c0f2e451e27b4f2 (patch) | |
| tree | 8d8cc50a7de738e1e6b7a66ec27120f616b3919a /arch/arm/common/pl330.c | |
| parent | 5f269e50cb10cd1a74b89f7fda87b0c9082754f0 (diff) | |
| parent | 44fb3170ae46f8de964a4bb5b0504e865a6dd7da (diff) | |
Merge commit 'v3.2.9' into rt-3.2.9-rt13v3.2.9-rt13
Diffstat (limited to 'arch/arm/common/pl330.c')
| -rw-r--r-- | arch/arm/common/pl330.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/common/pl330.c b/arch/arm/common/pl330.c index 8d8df744f7a5..67abef5a5882 100644 --- a/arch/arm/common/pl330.c +++ b/arch/arm/common/pl330.c @@ -1496,12 +1496,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); |