From 58ecc29b5e829c2072fe3a98a93ef163bdb36dd9 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sun, 17 Jul 2016 11:42:06 -0300 Subject: [media] cec: fix test for unconfigured adapter in main message loop The main message loop checks if the physical address was valid, and if not it is assumed that the adapter had been unconfigured. However, this check is no longer correct, instead it should check that both adap->is_configured and adap->is_configuring are false. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- drivers/staging/media/cec/cec-adap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/staging') diff --git a/drivers/staging/media/cec/cec-adap.c b/drivers/staging/media/cec/cec-adap.c index 159a89379959..6fa3db512138 100644 --- a/drivers/staging/media/cec/cec-adap.c +++ b/drivers/staging/media/cec/cec-adap.c @@ -332,7 +332,7 @@ int cec_thread_func(void *_adap) */ err = wait_event_interruptible_timeout(adap->kthread_waitq, kthread_should_stop() || - adap->phys_addr == CEC_PHYS_ADDR_INVALID || + (!adap->is_configured && !adap->is_configuring) || (!adap->transmitting && !list_empty(&adap->transmit_queue)), msecs_to_jiffies(CEC_XFER_TIMEOUT_MS)); @@ -347,7 +347,7 @@ int cec_thread_func(void *_adap) mutex_lock(&adap->lock); - if (adap->phys_addr == CEC_PHYS_ADDR_INVALID || + if ((!adap->is_configured && !adap->is_configuring) || kthread_should_stop()) { /* * If the adapter is disabled, or we're asked to stop, -- cgit v1.2.3