X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=drivers%2Fmedia%2Fcec%2Fcore%2Fcec-adap.c;h=d5d5d28d0b36a5a0e9facb3acb9dab0a48fdcac1;hb=463c43fcd97e493d8a17242f4f000c86fe642ed6;hp=3f016caa45ba7127568b3ba5e49f4bca516d2cce;hpb=7c9df3ec493e353166527f56ad1540d052b92cd4;p=linux-2.6-microblaze.git

diff --git a/drivers/media/cec/core/cec-adap.c b/drivers/media/cec/core/cec-adap.c
index 3f016caa45ba..d5d5d28d0b36 100644
--- a/drivers/media/cec/core/cec-adap.c
+++ b/drivers/media/cec/core/cec-adap.c
@@ -1205,7 +1205,7 @@ void cec_received_msg_ts(struct cec_adapter *adap,
 			/* Cancel the pending timeout work */
 			if (!cancel_delayed_work(&data->work)) {
 				mutex_unlock(&adap->lock);
-				flush_scheduled_work();
+				cancel_delayed_work_sync(&data->work);
 				mutex_lock(&adap->lock);
 			}
 			/*