Merge "msm: mdss: rotator: replace work_pending with work_busy"
diff --git a/drivers/video/msm/mdss/mdss_mdp_rotator.c b/drivers/video/msm/mdss/mdss_mdp_rotator.c
index 41f7f94..64a4020 100755
--- a/drivers/video/msm/mdss/mdss_mdp_rotator.c
+++ b/drivers/video/msm/mdss/mdss_mdp_rotator.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -476,7 +476,7 @@
goto rot_err;
}
- if (work_pending(&rot->commit_work)) {
+ if (work_busy(&rot->commit_work)) {
mutex_unlock(&rotator_lock);
flush_work(&rot->commit_work);
mutex_lock(&rotator_lock);
@@ -647,9 +647,9 @@
rot_pipe = rot->pipe;
if (rot_pipe) {
- if (work_pending(&rot->commit_work)) {
+ if (work_busy(&rot->commit_work)) {
mutex_unlock(&rotator_lock);
- cancel_work_sync(&rot->commit_work);
+ flush_work(&rot->commit_work);
mutex_lock(&rotator_lock);
}