diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2016-07-10 10:11:17 -0300 |
|---|---|---|
| committer | Ray Zhang <rayz@codeaurora.org> | 2017-05-25 11:21:57 +0800 |
| commit | 468ef730e27b4b71ebfea9cec92c7caa9fe92343 (patch) | |
| tree | f282e2092d48a3b6f0a2bac26ce7a4ecaafdfecf | |
| parent | ae758ae16bbde11d66fb7a494c567839de7227ac (diff) | |
[media] cec: add check if adapter is unregistered
CEC USB dongles can be unplugged at any time, and at that point they will
be unregistered. Make sure that any attempt afterwards to set the physical
or logical addresses will be ignored.
Change-Id: If15d1e3f3447c6a844eaee27cfdfd65a3341062e
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Git-commit: c000e5dad17d20c644bbf3ead52c334025d11ada
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
Signed-off-by: Ray Zhang <rayz@codeaurora.org>
| -rw-r--r-- | drivers/staging/media/cec/cec-adap.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/staging/media/cec/cec-adap.c b/drivers/staging/media/cec/cec-adap.c index 7df61870473c..2cd656bd5272 100644 --- a/drivers/staging/media/cec/cec-adap.c +++ b/drivers/staging/media/cec/cec-adap.c @@ -1104,7 +1104,7 @@ 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) + if (phys_addr == adap->phys_addr || adap->devnode.unregistered) return; if (phys_addr == CEC_PHYS_ADDR_INVALID || @@ -1158,6 +1158,9 @@ int __cec_s_log_addrs(struct cec_adapter *adap, u16 type_mask = 0; int i; + if (adap->devnode.unregistered) + return -ENODEV; + if (!log_addrs || log_addrs->num_log_addrs == 0) { adap->log_addrs.num_log_addrs = 0; cec_adap_unconfigure(adap); |