diff options
| author | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2022-05-06 10:25:55 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@kernel.org> | 2022-05-13 12:28:06 +0300 |
| commit | 498946cf6b85b5eafb142132a11351814f578535 (patch) | |
| tree | 10c54cbd6281dbbb119d616ad944c2c9480fec65 /drivers/media | |
| parent | 5f4eb16750511125aa1a874dd8cf1682a9d6a8a7 (diff) | |
| download | linux-498946cf6b85b5eafb142132a11351814f578535.tar.xz | |
media: cec-adap.c: don't unconfigure if already unconfigured
The __cec_s_log_addrs() function can configure or unconfigure the
adapter. The ioctl handler in cec-api.c will prevent it from being
called to configure the adapter if it was already configured (or in
the process of configuring). But it can still be called to unconfigure
an already unconfigured adapter, and it didn't check for that.
This can cause cec_activate_cnt_dec() to be called too often, causing
a WARN_ON.
Instead first check if adap->log_addrs.num_log_addrs == 0 and return
since in that case the adapter is already unconfigured.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/cec/core/cec-adap.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/cec/core/cec-adap.c b/drivers/media/cec/core/cec-adap.c index e789aec7455c..b47280fa3b87 100644 --- a/drivers/media/cec/core/cec-adap.c +++ b/drivers/media/cec/core/cec-adap.c @@ -1709,9 +1709,10 @@ int __cec_s_log_addrs(struct cec_adapter *adap, return -ENODEV; if (!log_addrs || log_addrs->num_log_addrs == 0) { - if (!adap->is_configuring && !adap->is_configured) + if (!adap->log_addrs.num_log_addrs) return 0; - cec_adap_unconfigure(adap); + if (adap->is_configuring || adap->is_configured) + cec_adap_unconfigure(adap); adap->log_addrs.num_log_addrs = 0; for (i = 0; i < CEC_MAX_LOG_ADDRS; i++) adap->log_addrs.log_addr[i] = CEC_LOG_ADDR_INVALID; |