From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Sasha Levin <sashal@kernel.org>,
linux-media@vger.kernel.org
Subject: [PATCH AUTOSEL 6.3 10/19] media: cec: core: disable adapter in cec_devnode_unregister
Date: Thu, 15 Jun 2023 07:37:10 -0400 [thread overview]
Message-ID: <20230615113719.648862-10-sashal@kernel.org> (raw)
In-Reply-To: <20230615113719.648862-1-sashal@kernel.org>
From: Hans Verkuil <hverkuil-cisco@xs4all.nl>
[ Upstream commit fe4526d99e2e06b08bb80316c3a596ea6a807b75 ]
Explicitly disable the CEC adapter in cec_devnode_unregister()
Usually this does not really do anything important, but for drivers
that use the CEC pin framework this is needed to properly stop the
hrtimer. Without this a crash would happen when such a driver is
unloaded with rmmod.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/media/cec/core/cec-adap.c | 5 ++++-
drivers/media/cec/core/cec-core.c | 2 ++
drivers/media/cec/core/cec-priv.h | 1 +
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/media/cec/core/cec-adap.c b/drivers/media/cec/core/cec-adap.c
index 4f5ab3cae8a71..ac18707fddcd2 100644
--- a/drivers/media/cec/core/cec-adap.c
+++ b/drivers/media/cec/core/cec-adap.c
@@ -1582,7 +1582,7 @@ static void cec_claim_log_addrs(struct cec_adapter *adap, bool block)
*
* This function is called with adap->lock held.
*/
-static int cec_adap_enable(struct cec_adapter *adap)
+int cec_adap_enable(struct cec_adapter *adap)
{
bool enable;
int ret = 0;
@@ -1592,6 +1592,9 @@ static int cec_adap_enable(struct cec_adapter *adap)
if (adap->needs_hpd)
enable = enable && adap->phys_addr != CEC_PHYS_ADDR_INVALID;
+ if (adap->devnode.unregistered)
+ enable = false;
+
if (enable == adap->is_enabled)
return 0;
diff --git a/drivers/media/cec/core/cec-core.c b/drivers/media/cec/core/cec-core.c
index af358e901b5f3..7e153c5cad04f 100644
--- a/drivers/media/cec/core/cec-core.c
+++ b/drivers/media/cec/core/cec-core.c
@@ -191,6 +191,8 @@ static void cec_devnode_unregister(struct cec_adapter *adap)
mutex_lock(&adap->lock);
__cec_s_phys_addr(adap, CEC_PHYS_ADDR_INVALID, false);
__cec_s_log_addrs(adap, NULL, false);
+ // Disable the adapter (since adap->devnode.unregistered is true)
+ cec_adap_enable(adap);
mutex_unlock(&adap->lock);
cdev_device_del(&devnode->cdev, &devnode->dev);
diff --git a/drivers/media/cec/core/cec-priv.h b/drivers/media/cec/core/cec-priv.h
index b78df931aa74b..ed1f8c67626bf 100644
--- a/drivers/media/cec/core/cec-priv.h
+++ b/drivers/media/cec/core/cec-priv.h
@@ -47,6 +47,7 @@ int cec_monitor_pin_cnt_inc(struct cec_adapter *adap);
void cec_monitor_pin_cnt_dec(struct cec_adapter *adap);
int cec_adap_status(struct seq_file *file, void *priv);
int cec_thread_func(void *_adap);
+int cec_adap_enable(struct cec_adapter *adap);
void __cec_s_phys_addr(struct cec_adapter *adap, u16 phys_addr, bool block);
int __cec_s_log_addrs(struct cec_adapter *adap,
struct cec_log_addrs *log_addrs, bool block);
--
2.39.2
next prev parent reply other threads:[~2023-06-15 11:39 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-15 11:37 [PATCH AUTOSEL 6.3 01/19] regmap: Account for register length when chunking Sasha Levin
2023-06-15 11:37 ` [PATCH AUTOSEL 6.3 02/19] iommu/amd: Handle GALog overflows Sasha Levin
2023-06-15 11:37 ` [PATCH AUTOSEL 6.3 03/19] scsi: target: iscsi: Fix hang in the iSCSI login code Sasha Levin
2023-06-15 11:37 ` [PATCH AUTOSEL 6.3 04/19] scsi: target: iscsi: Remove unused transport_timer Sasha Levin
2023-06-15 11:37 ` [PATCH AUTOSEL 6.3 05/19] scsi: target: iscsi: Prevent login threads from racing between each other Sasha Levin
2023-06-15 11:37 ` [PATCH AUTOSEL 6.3 06/19] HID: google: add jewel USB id Sasha Levin
2023-06-15 11:37 ` [PATCH AUTOSEL 6.3 07/19] HID: wacom: Add error check to wacom_parse_and_register() Sasha Levin
2023-06-15 11:37 ` [PATCH AUTOSEL 6.3 08/19] arm64: Add missing Set/Way CMO encodings Sasha Levin
2023-06-15 11:37 ` [PATCH AUTOSEL 6.3 09/19] smb3: missing null check in SMB2_change_notify Sasha Levin
2023-06-15 11:37 ` Sasha Levin [this message]
2023-06-15 11:37 ` [PATCH AUTOSEL 6.3 11/19] media: cec: core: don't set last_initiator if tx in progress Sasha Levin
2023-06-15 11:37 ` [PATCH AUTOSEL 6.3 12/19] nfcsim.c: Fix error checking for debugfs_create_dir Sasha Levin
2023-06-15 11:37 ` [PATCH AUTOSEL 6.3 13/19] btrfs: fix an uninitialized variable warning in btrfs_log_inode Sasha Levin
2023-06-15 11:37 ` [PATCH AUTOSEL 6.3 14/19] usb: gadget: udc: fix NULL dereference in remove() Sasha Levin
2023-06-15 11:37 ` [PATCH AUTOSEL 6.3 15/19] nvme: fix miss command type check Sasha Levin
2023-06-15 11:37 ` [PATCH AUTOSEL 6.3 16/19] nvme: double KA polling frequency to avoid KATO with TBKAS on Sasha Levin
2023-06-15 11:37 ` [PATCH AUTOSEL 6.3 17/19] nvme: check IO start time when deciding to defer KA Sasha Levin
2023-06-15 11:37 ` [PATCH AUTOSEL 6.3 18/19] ext4: enable the lazy init thread when remounting read/write Sasha Levin
2023-06-15 11:37 ` [PATCH AUTOSEL 6.3 19/19] nvme: improve handling of long keep alives Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230615113719.648862-10-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox