* [PATCH v2] drm: bridge: adv7511: Add check for mipi_dsi_driver_register
@ 2022-06-02 10:34 Jiasheng Jiang
2022-06-02 14:20 ` Laurent Pinchart
2022-06-24 20:33 ` Sam Ravnborg
0 siblings, 2 replies; 3+ messages in thread
From: Jiasheng Jiang @ 2022-06-02 10:34 UTC (permalink / raw)
To: laurent.pinchart
Cc: andrzej.hajda, narmstrong, robert.foss, jonas, jernej.skrabec,
airlied, daniel, maxime, sam, alsi, jagan, biju.das.jz, l.stach,
dri-devel, linux-kernel, Jiasheng Jiang
As mipi_dsi_driver_register could return error if fails,
it should be better to check the return value and return error
if fails.
Moreover, if i2c_add_driver fails, mipi_dsi_driver_register
should be reverted.
Fixes: 1e4d58cd7f88 ("drm/bridge: adv7533: Create a MIPI DSI device")
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
---
Changelog:
v1 -> v2
*Change 1. Add the mipi_dsi_driver_unregister if i2c_add_driver fails.
---
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
index 5bb9300040dd..2275d15d4a8b 100644
--- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
@@ -1392,10 +1392,21 @@ static struct i2c_driver adv7511_driver = {
static int __init adv7511_init(void)
{
- if (IS_ENABLED(CONFIG_DRM_MIPI_DSI))
- mipi_dsi_driver_register(&adv7533_dsi_driver);
+ int ret;
+
+ if (IS_ENABLED(CONFIG_DRM_MIPI_DSI)) {
+ ret = mipi_dsi_driver_register(&adv7533_dsi_driver);
+ if (ret)
+ return ret;
+ }
- return i2c_add_driver(&adv7511_driver);
+ ret = i2c_add_driver(&adv7511_driver);
+ if (ret) {
+ if (IS_ENABLED(CONFIG_DRM_MIPI_DSI))
+ mipi_dsi_driver_unregister(&adv7533_dsi_driver);
+ }
+
+ return ret;
}
module_init(adv7511_init);
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] drm: bridge: adv7511: Add check for mipi_dsi_driver_register
2022-06-02 10:34 [PATCH v2] drm: bridge: adv7511: Add check for mipi_dsi_driver_register Jiasheng Jiang
@ 2022-06-02 14:20 ` Laurent Pinchart
2022-06-24 20:33 ` Sam Ravnborg
1 sibling, 0 replies; 3+ messages in thread
From: Laurent Pinchart @ 2022-06-02 14:20 UTC (permalink / raw)
To: Jiasheng Jiang
Cc: andrzej.hajda, narmstrong, robert.foss, jonas, jernej.skrabec,
airlied, daniel, maxime, sam, alsi, jagan, biju.das.jz, l.stach,
dri-devel, linux-kernel
Hi Jiasheng,
Thank you for the patch.
On Thu, Jun 02, 2022 at 06:34:01PM +0800, Jiasheng Jiang wrote:
> As mipi_dsi_driver_register could return error if fails,
> it should be better to check the return value and return error
> if fails.
> Moreover, if i2c_add_driver fails, mipi_dsi_driver_register
> should be reverted.
>
> Fixes: 1e4d58cd7f88 ("drm/bridge: adv7533: Create a MIPI DSI device")
> Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> Changelog:
>
> v1 -> v2
>
> *Change 1. Add the mipi_dsi_driver_unregister if i2c_add_driver fails.
> ---
> drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 17 ++++++++++++++---
> 1 file changed, 14 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> index 5bb9300040dd..2275d15d4a8b 100644
> --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> @@ -1392,10 +1392,21 @@ static struct i2c_driver adv7511_driver = {
>
> static int __init adv7511_init(void)
> {
> - if (IS_ENABLED(CONFIG_DRM_MIPI_DSI))
> - mipi_dsi_driver_register(&adv7533_dsi_driver);
> + int ret;
> +
> + if (IS_ENABLED(CONFIG_DRM_MIPI_DSI)) {
> + ret = mipi_dsi_driver_register(&adv7533_dsi_driver);
> + if (ret)
> + return ret;
> + }
>
> - return i2c_add_driver(&adv7511_driver);
> + ret = i2c_add_driver(&adv7511_driver);
> + if (ret) {
> + if (IS_ENABLED(CONFIG_DRM_MIPI_DSI))
> + mipi_dsi_driver_unregister(&adv7533_dsi_driver);
> + }
> +
> + return ret;
> }
> module_init(adv7511_init);
>
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] drm: bridge: adv7511: Add check for mipi_dsi_driver_register
2022-06-02 10:34 [PATCH v2] drm: bridge: adv7511: Add check for mipi_dsi_driver_register Jiasheng Jiang
2022-06-02 14:20 ` Laurent Pinchart
@ 2022-06-24 20:33 ` Sam Ravnborg
1 sibling, 0 replies; 3+ messages in thread
From: Sam Ravnborg @ 2022-06-24 20:33 UTC (permalink / raw)
To: Jiasheng Jiang
Cc: laurent.pinchart, jagan, jonas, airlied, dri-devel, narmstrong,
linux-kernel, jernej.skrabec, robert.foss, andrzej.hajda, alsi,
biju.das.jz, maxime
On Thu, Jun 02, 2022 at 06:34:01PM +0800, Jiasheng Jiang wrote:
> As mipi_dsi_driver_register could return error if fails,
> it should be better to check the return value and return error
> if fails.
> Moreover, if i2c_add_driver fails, mipi_dsi_driver_register
> should be reverted.
>
> Fixes: 1e4d58cd7f88 ("drm/bridge: adv7533: Create a MIPI DSI device")
> Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
Thanks, added to drm-misc (added to drm-misc-next as this did not look
like something that required fast forward to mainline).
Sam
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-06-24 20:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-02 10:34 [PATCH v2] drm: bridge: adv7511: Add check for mipi_dsi_driver_register Jiasheng Jiang
2022-06-02 14:20 ` Laurent Pinchart
2022-06-24 20:33 ` Sam Ravnborg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).