From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Hans Verkuil <hverkuil@kernel.org>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Ettore Chimenti <ek5.chimenti@gmail.com>
Subject: [PATCH v1 2/8] media: cec: core: add missing mutex_destroy to error path and remove
Date: Thu, 9 Jul 2026 10:20:54 +0200 [thread overview]
Message-ID: <20260709082315.72685-3-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20260709082315.72685-1-andriy.shevchenko@linux.intel.com>
Add missing mutex_destroy() call to error path and remove to properly
clean up the mutex initialized during adapter allocation. Ensure proper
resource cleanup and follows kernel practices.
Found by code review.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/media/cec/core/cec-core.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/drivers/media/cec/core/cec-core.c b/drivers/media/cec/core/cec-core.c
index 55011e555d35..0c89fac58349 100644
--- a/drivers/media/cec/core/cec-core.c
+++ b/drivers/media/cec/core/cec-core.c
@@ -302,6 +302,11 @@ struct cec_adapter *cec_allocate_adapter(const struct cec_adap_ops *ops,
return adap;
err_free_adap:
+ mutex_destroy(&adap->devnode.lock);
+ mutex_destroy(&adap->devnode.lock_fhs);
+
+ mutex_destroy(&adap->lock);
+
kfree(adap);
return ERR_PTR(res);
}
@@ -388,14 +393,23 @@ void cec_delete_adapter(struct cec_adapter *adap)
{
if (IS_ERR_OR_NULL(adap))
return;
+
if (adap->kthread_config)
kthread_stop(adap->kthread_config);
kthread_stop(adap->kthread);
+
if (adap->ops->adap_free)
adap->ops->adap_free(adap);
+
#ifdef CONFIG_MEDIA_CEC_RC
rc_free_device(adap->rc);
#endif
+
+ mutex_destroy(&adap->devnode.lock);
+ mutex_destroy(&adap->devnode.lock_fhs);
+
+ mutex_destroy(&adap->lock);
+
kfree(adap);
}
EXPORT_SYMBOL_GPL(cec_delete_adapter);
--
2.50.1
next prev parent reply other threads:[~2026-07-09 8:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-09 8:20 [PATCH v1 0/8] media: cec: core: Ad-hoc refactoring Andy Shevchenko
2026-07-09 8:20 ` [PATCH v1 1/8] media: cec: core: consolidate error path in cec_allocate_adapter() Andy Shevchenko
2026-07-09 8:20 ` Andy Shevchenko [this message]
2026-07-09 8:20 ` [PATCH v1 3/8] media: cec: core: Use DEFINE_SHOW_STORE_ATTRIBUTE() helper for debugfs Andy Shevchenko
2026-07-09 8:20 ` [PATCH v1 4/8] media: cec: core: Don't use "proxy" headers Andy Shevchenko
2026-07-09 8:20 ` [PATCH v1 5/8] media: cec: core: Add pr_fmt() Andy Shevchenko
2026-07-09 8:20 ` [PATCH v1 6/8] media: cec: core: Consistently use CEC_NAME where it matters Andy Shevchenko
2026-07-09 8:20 ` [PATCH v1 7/8] media: cec: core: Use predefined time multiplier Andy Shevchenko
2026-07-09 8:21 ` [PATCH v1 8/8] media: cec: seco: " Andy Shevchenko
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=20260709082315.72685-3-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=ek5.chimenti@gmail.com \
--cc=hverkuil@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@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