commit 2f21aa2caf5d9754ce3e43d85f5aed779137dbd4
author Linux Build Service Account <lnxbuild@localhost> Tue Mar 27 22:56:21 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Tue Mar 27 22:56:21 2012 -0700
tree a016223211b08643dbde0f533f2a2acdbe4f2b8b
parent 23562515c6bfb4b054cc79de9fdc1ded0d428947
parent 16f27dc68e406e181c306cc1fb924dca43fb1080

Merge "video: msm: writeback: Stop providing buffers to mdp in stopping state" into msm-3.0

drivers/video/msm/mdp4_overlay_writeback.c

diff --git a/drivers/video/msm/mdp4_overlay_writeback.c b/drivers/video/msm/mdp4_overlay_writeback.c
index 7739837..d8e7998 100644
--- a/drivers/video/msm/mdp4_overlay_writeback.c
+++ b/drivers/video/msm/mdp4_overlay_writeback.c
@@ -258,7 +258,9 @@
 	struct msmfb_writeback_data_list *node = NULL;
 	mutex_lock(&mfd->unregister_mutex);
 	mutex_lock(&mfd->writeback_mutex);
-	if (!list_empty(&mfd->writeback_free_queue)) {
+	if (!list_empty(&mfd->writeback_free_queue)
+		&& mfd->writeback_state != WB_STOPING
+		&& mfd->writeback_state != WB_STOP) {
 		node = list_first_entry(&mfd->writeback_free_queue,
 				struct msmfb_writeback_data_list, active_entry);
 	}
@@ -306,7 +308,9 @@
 
 	mutex_lock(&mfd->unregister_mutex);
 	mutex_lock(&mfd->writeback_mutex);
-	if (!list_empty(&mfd->writeback_free_queue)) {
+	if (!list_empty(&mfd->writeback_free_queue)
+		&& mfd->writeback_state != WB_STOPING
+		&& mfd->writeback_state != WB_STOP) {
 		node = list_first_entry(&mfd->writeback_free_queue,
 				struct msmfb_writeback_data_list, active_entry);
 	}