diff options
| author | Hans Verkuil | 2016-07-10 15:11:17 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2016-07-12 18:38:16 +0200 |
| commit | c000e5dad17d20c644bbf3ead52c334025d11ada (patch) | |
| tree | 2bac0b609d6260e786cab8a4f132fe0733eccc03 /drivers/staging | |
| parent | [media] adv7511: the h/vsync polarities were always positive (diff) | |
| download | kernel-qcow2-linux-c000e5dad17d20c644bbf3ead52c334025d11ada.tar.gz kernel-qcow2-linux-c000e5dad17d20c644bbf3ead52c334025d11ada.tar.xz kernel-qcow2-linux-c000e5dad17d20c644bbf3ead52c334025d11ada.zip | |
[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.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/staging')
| -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); |