diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-09-30 18:24:01 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-30 18:24:01 -0700 |
| commit | 456cfbdf20e8e096ca2fddebc89cf9b19752b648 (patch) | |
| tree | 1daa60850d6c60b99914c3b12baf3fc6d2028761 | |
| parent | 36b28a7842584f483c552d4e56dcb3673af05a00 (diff) | |
| parent | df7dd145f09de91ca58f8747bdef307e2508dd6d (diff) | |
Merge "msm: kgsl: Fix dispatch_q NULL dereference"
| -rw-r--r-- | drivers/gpu/msm/adreno_dispatch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/msm/adreno_dispatch.c b/drivers/gpu/msm/adreno_dispatch.c index 5d3b2b8a7266..522c32743d3d 100644 --- a/drivers/gpu/msm/adreno_dispatch.c +++ b/drivers/gpu/msm/adreno_dispatch.c @@ -1814,7 +1814,7 @@ static int dispatcher_do_fault(struct adreno_device *adreno_dev) } } - if (!adreno_cmdqueue_is_empty(dispatch_q)) { + if (dispatch_q && !adreno_cmdqueue_is_empty(dispatch_q)) { cmdbatch = dispatch_q->cmd_q[dispatch_q->head]; trace_adreno_cmdbatch_fault(cmdbatch, fault); } |