diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-11-18 01:54:48 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-18 01:54:48 -0800 |
| commit | 2ddc39e63434669df17e4c7f3a6651f827ae3340 (patch) | |
| tree | a696addde14ec588b371f63a560d647dd41de3b9 /drivers | |
| parent | db18e6f95ecf8e086edd1347553b8438cd95b078 (diff) | |
| parent | acef8428426c5dad44d940d88b619fcd3282e28a (diff) | |
Merge "msm: mdss: fix incorrect mutex unlocking during NOTIFY_UPDATE_STOP"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_fb.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/fbdev/msm/mdss_fb.c b/drivers/video/fbdev/msm/mdss_fb.c index 08e06c75522a..d528305af798 100644 --- a/drivers/video/fbdev/msm/mdss_fb.c +++ b/drivers/video/fbdev/msm/mdss_fb.c @@ -233,9 +233,11 @@ static int mdss_fb_notify_update(struct msm_fb_data_type *mfd, } } else if (notify == NOTIFY_UPDATE_STOP) { mutex_lock(&mfd->update.lock); - if (mfd->update.init_done) + if (mfd->update.init_done) { + mutex_unlock(&mfd->update.lock); + mutex_lock(&mfd->no_update.lock); reinit_completion(&mfd->no_update.comp); - else { + } else { mutex_unlock(&mfd->update.lock); pr_err("notify update stop called without init\n"); return -EINVAL; |