diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2017-08-20 14:41:41 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-08-26 15:32:15 +0300 |
| commit | 152b0a9a3d62f90e6784a5d35ffc3f552f1c2c54 (patch) | |
| tree | 5c47d7c13ae95619ed485f816b7bea70d3183c4d /drivers/media/cec | |
| parent | 0779b8855c746c90b85bfe6e16d5dfa2a6a46655 (diff) | |
| download | linux-152b0a9a3d62f90e6784a5d35ffc3f552f1c2c54.tar.xz | |
media: cec: ensure that adap_enable(false) is called from cec_delete_adapter()
When the adapter is removed the cec_delete_adapter() call attempts
to set the physical address to INVALID by calling __cec_s_phys_addr()
and so disabling the adapter.
However, __cec_s_phys_addr checks if the device node was unregistered
and just returns in that case.
This means that the adap_enable callback is never called with 'false'
to disable the CEC adapter. Most drivers don't care, but some need
to do cleanup here.
Change the test so the adapter is correctly disabled, even when the
device node is unregistered.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Reported-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/cec')
| -rw-r--r-- | drivers/media/cec/cec-adap.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/cec/cec-adap.c b/drivers/media/cec/cec-adap.c index 9f8b64f2b253..dd769e40416f 100644 --- a/drivers/media/cec/cec-adap.c +++ b/drivers/media/cec/cec-adap.c @@ -1448,7 +1448,9 @@ static void cec_claim_log_addrs(struct cec_adapter *adap, bool block) */ void __cec_s_phys_addr(struct cec_adapter *adap, u16 phys_addr, bool block) { - if (phys_addr == adap->phys_addr || adap->devnode.unregistered) + if (phys_addr == adap->phys_addr) + return; + if (phys_addr != CEC_PHYS_ADDR_INVALID && adap->devnode.unregistered) return; dprintk(1, "new physical address %x.%x.%x.%x\n", |