From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Cc: pavel@ucw.cz
Subject: [PATCH 8/8] omap3isp: Destroy CSI-2 phy mutexes in error and module removal
Date: Thu, 6 Jul 2017 02:00:19 +0300 [thread overview]
Message-ID: <20170705230019.5461-9-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <20170705230019.5461-1-sakari.ailus@linux.intel.com>
The CSI-2 phy driver did initialise mutexes in its init function but there
was no corresponding cleanup function destroying them. Fix that. Also
clean up ISP module initialisation a little.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
drivers/media/platform/omap3isp/isp.c | 6 ++++--
drivers/media/platform/omap3isp/ispcsiphy.c | 6 ++++++
drivers/media/platform/omap3isp/ispcsiphy.h | 1 +
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index 0676be725d7c..7028bbe13b69 100644
--- a/drivers/media/platform/omap3isp/isp.c
+++ b/drivers/media/platform/omap3isp/isp.c
@@ -1859,6 +1859,7 @@ static void isp_cleanup_modules(struct isp_device *isp)
omap3isp_ccdc_cleanup(isp);
omap3isp_ccp2_cleanup(isp);
omap3isp_csi2_cleanup(isp);
+ omap3isp_csiphy_cleanup(isp);
}
static int isp_initialize_modules(struct isp_device *isp)
@@ -1868,7 +1869,7 @@ static int isp_initialize_modules(struct isp_device *isp)
ret = omap3isp_csiphy_init(isp);
if (ret < 0) {
dev_err(isp->dev, "CSI PHY initialization failed\n");
- goto error_csiphy;
+ return ret;
}
ret = omap3isp_csi2_init(isp);
@@ -1937,7 +1938,8 @@ static int isp_initialize_modules(struct isp_device *isp)
error_ccp2:
omap3isp_csi2_cleanup(isp);
error_csi2:
-error_csiphy:
+ omap3isp_csiphy_cleanup(isp);
+
return ret;
}
diff --git a/drivers/media/platform/omap3isp/ispcsiphy.c b/drivers/media/platform/omap3isp/ispcsiphy.c
index 871d4fe09c7f..83940e9d8291 100644
--- a/drivers/media/platform/omap3isp/ispcsiphy.c
+++ b/drivers/media/platform/omap3isp/ispcsiphy.c
@@ -345,3 +345,9 @@ int omap3isp_csiphy_init(struct isp_device *isp)
return 0;
}
+
+void omap3isp_csiphy_cleanup(struct isp_device *isp)
+{
+ mutex_destroy(&isp->isp_csiphy1.mutex);
+ mutex_destroy(&isp->isp_csiphy2.mutex);
+}
diff --git a/drivers/media/platform/omap3isp/ispcsiphy.h b/drivers/media/platform/omap3isp/ispcsiphy.h
index 28b63b28f9f7..978ca5c80a6c 100644
--- a/drivers/media/platform/omap3isp/ispcsiphy.h
+++ b/drivers/media/platform/omap3isp/ispcsiphy.h
@@ -39,5 +39,6 @@ struct isp_csiphy {
int omap3isp_csiphy_acquire(struct isp_csiphy *phy);
void omap3isp_csiphy_release(struct isp_csiphy *phy);
int omap3isp_csiphy_init(struct isp_device *isp);
+void omap3isp_csiphy_cleanup(struct isp_device *isp);
#endif /* OMAP3_ISP_CSI_PHY_H */
--
2.11.0
next prev parent reply other threads:[~2017-07-05 23:00 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-05 23:00 [PATCH 0/8] Prepare for CCP2 / CSI-1 support, omap3isp fixes Sakari Ailus
2017-07-05 23:00 ` [PATCH 1/8] dt: bindings: Explicitly specify bus type Sakari Ailus
2017-07-05 23:00 ` [PATCH 2/8] dt: bindings: Add strobe property for CCP2 Sakari Ailus
2017-07-05 23:00 ` [PATCH 3/8] v4l: fwnode: Call CSI2 bus csi2, not csi Sakari Ailus
2017-07-06 11:07 ` Sebastian Reichel
2017-07-05 23:00 ` [PATCH 4/8] v4l: fwnode: Obtain data bus type from FW Sakari Ailus
2017-07-06 11:08 ` Sebastian Reichel
2017-07-05 23:00 ` [PATCH 5/8] v4l: Add support for CSI-1 and CCP2 busses Sakari Ailus
2017-07-06 11:08 ` Sebastian Reichel
2017-07-19 19:37 ` Mauro Carvalho Chehab
2017-07-19 20:53 ` Sakari Ailus
2017-07-19 20:56 ` Mauro Carvalho Chehab
2017-07-20 7:32 ` Pavel Machek
2017-07-05 23:00 ` [PATCH 6/8] smiapp: add CCP2 support Sakari Ailus
2017-07-05 23:00 ` [PATCH 7/8] omap3isp: Check for valid port in endpoints Sakari Ailus
2017-07-06 11:11 ` Sebastian Reichel
2017-07-07 13:04 ` Sakari Ailus
2017-07-13 11:12 ` Pavel Machek
2017-07-05 23:00 ` Sakari Ailus [this message]
2017-07-06 10:43 ` [PATCH 0/8] Prepare for CCP2 / CSI-1 support, omap3isp fixes Pavel Machek
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=20170705230019.5461-9-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=linux-media@vger.kernel.org \
--cc=pavel@ucw.cz \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.