diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-09-06 12:55:54 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-09-06 12:55:54 -0700 |
| commit | 02411b451a79fe963af4e991601a6f96e8a1ed59 (patch) | |
| tree | e7093c850d2018c4e8ec00de48080df4dded541d | |
| parent | 120dd65a368d1d0177a42b1e77a183c1fddf2bc4 (diff) | |
| parent | f696aed9e703de20fa0dc3e1cba9687b11dc7b3a (diff) | |
Merge "msm: sde: Avoid NULL pointer dereference in cancel request"
| -rw-r--r-- | drivers/media/platform/msm/sde/rotator/sde_rotator_core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/platform/msm/sde/rotator/sde_rotator_core.c b/drivers/media/platform/msm/sde/rotator/sde_rotator_core.c index abf20aef1256..422c7a590a45 100644 --- a/drivers/media/platform/msm/sde/rotator/sde_rotator_core.c +++ b/drivers/media/platform/msm/sde/rotator/sde_rotator_core.c @@ -2003,8 +2003,10 @@ static void sde_rotator_cancel_request(struct sde_rot_mgr *mgr, sde_rot_mgr_unlock(mgr); for (i = req->count - 1; i >= 0; i--) { entry = req->entries + i; - flush_kthread_worker(&entry->commitq->rot_kw); - flush_kthread_worker(&entry->doneq->rot_kw); + if (entry->commitq) + flush_kthread_worker(&entry->commitq->rot_kw); + if (entry->doneq) + flush_kthread_worker(&entry->doneq->rot_kw); } sde_rot_mgr_lock(mgr); SDEROT_DBG("cancel work done\n"); |