* [PATCH] drm/bridge: anx7625: Fix null vs IS_ERR() checking in anx7625_register_i2c_dummy_clients
@ 2021-12-22 8:33 ` Miaoqian Lin
0 siblings, 0 replies; 6+ messages in thread
From: Miaoqian Lin @ 2021-12-22 8:33 UTC (permalink / raw)
Cc: linmq006, Andrzej Hajda, Neil Armstrong, Robert Foss,
Laurent Pinchart, Jonas Karlman, Jernej Skrabec, David Airlie,
Daniel Vetter, Pi-Hsun Shih, Xin Ji, Sam Ravnborg, Tzung-Bi Shih,
Hsin-Yi Wang, Nicolas Boichat, dri-devel, linux-kernel
Since i2c_new_client_device() function return error pointers.
The i2c_new_dummy_device() function does not return NULL, It returns error
pointers too. Using IS_ERR() to check the return value to fix this.
Fixes: 8bdfc5dae4e3("drm/bridge: anx7625: Add anx7625 MIPI DSI/DPI to DP")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
---
drivers/gpu/drm/bridge/analogix/anx7625.c | 32 ++++++++++++++++-------
1 file changed, 23 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c
index 1a871f6b6822..eb72aa6aedd6 100644
--- a/drivers/gpu/drm/bridge/analogix/anx7625.c
+++ b/drivers/gpu/drm/bridge/analogix/anx7625.c
@@ -1637,40 +1637,54 @@ static const struct drm_bridge_funcs anx7625_bridge_funcs = {
static int anx7625_register_i2c_dummy_clients(struct anx7625_data *ctx,
struct i2c_client *client)
{
+ int err = 0;
+
ctx->i2c.tx_p0_client = i2c_new_dummy_device(client->adapter,
TX_P0_ADDR >> 1);
- if (!ctx->i2c.tx_p0_client)
- return -ENOMEM;
+ if (IS_ERR(ctx->i2c.tx_p0_client))
+ return PTR_ERR(ctx->i2c.tx_p0_client);
ctx->i2c.tx_p1_client = i2c_new_dummy_device(client->adapter,
TX_P1_ADDR >> 1);
- if (!ctx->i2c.tx_p1_client)
+ if (IS_ERR(ctx->i2c.tx_p1_client)) {
+ err = PTR_ERR(ctx->i2c.tx_p1_client);
goto free_tx_p0;
+ }
ctx->i2c.tx_p2_client = i2c_new_dummy_device(client->adapter,
TX_P2_ADDR >> 1);
- if (!ctx->i2c.tx_p2_client)
+ if (IS_ERR(ctx->i2c.tx_p2_client)) {
+ err = PTR_ERR(ctx->i2c.tx_p2_client);
goto free_tx_p1;
+ }
ctx->i2c.rx_p0_client = i2c_new_dummy_device(client->adapter,
RX_P0_ADDR >> 1);
- if (!ctx->i2c.rx_p0_client)
+ if (IS_ERR(ctx->i2c.rx_p0_client)) {
+ err = PTR_ERR(ctx->i2c.rx_p0_client);
goto free_tx_p2;
+ }
ctx->i2c.rx_p1_client = i2c_new_dummy_device(client->adapter,
RX_P1_ADDR >> 1);
- if (!ctx->i2c.rx_p1_client)
+ if (IS_ERR(ctx->i2c.rx_p1_client)) {
+ err = PTR_ERR(ctx->i2c.rx_p1_client);
goto free_rx_p0;
+ }
ctx->i2c.rx_p2_client = i2c_new_dummy_device(client->adapter,
RX_P2_ADDR >> 1);
- if (!ctx->i2c.rx_p2_client)
+ if (IS_ERR(ctx->i2c.rx_p2_client)) {
+ err = PTR_ERR(ctx->i2c.rx_p2_client);
goto free_rx_p1;
+ }
ctx->i2c.tcpc_client = i2c_new_dummy_device(client->adapter,
TCPC_INTERFACE_ADDR >> 1);
- if (!ctx->i2c.tcpc_client)
+ if (IS_ERR(ctx->i2c.tcpc_client)) {
+ err = PTR_ERR(ctx->i2c.tcpc_client);
goto free_rx_p2;
+ }
return 0;
@@ -1687,7 +1701,7 @@ static int anx7625_register_i2c_dummy_clients(struct anx7625_data *ctx,
free_tx_p0:
i2c_unregister_device(ctx->i2c.tx_p0_client);
- return -ENOMEM;
+ return err;
}
static void anx7625_unregister_i2c_dummy_clients(struct anx7625_data *ctx)
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] drm/bridge: anx7625: Fix null vs IS_ERR() checking in anx7625_register_i2c_dummy_clients
@ 2021-12-22 8:33 ` Miaoqian Lin
0 siblings, 0 replies; 6+ messages in thread
From: Miaoqian Lin @ 2021-12-22 8:33 UTC (permalink / raw)
Cc: linmq006, Jernej Skrabec, Pi-Hsun Shih, Jonas Karlman,
David Airlie, dri-devel, Neil Armstrong, linux-kernel,
Robert Foss, Andrzej Hajda, Nicolas Boichat, Laurent Pinchart,
Hsin-Yi Wang, Tzung-Bi Shih, Sam Ravnborg, Xin Ji
Since i2c_new_client_device() function return error pointers.
The i2c_new_dummy_device() function does not return NULL, It returns error
pointers too. Using IS_ERR() to check the return value to fix this.
Fixes: 8bdfc5dae4e3("drm/bridge: anx7625: Add anx7625 MIPI DSI/DPI to DP")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
---
drivers/gpu/drm/bridge/analogix/anx7625.c | 32 ++++++++++++++++-------
1 file changed, 23 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c
index 1a871f6b6822..eb72aa6aedd6 100644
--- a/drivers/gpu/drm/bridge/analogix/anx7625.c
+++ b/drivers/gpu/drm/bridge/analogix/anx7625.c
@@ -1637,40 +1637,54 @@ static const struct drm_bridge_funcs anx7625_bridge_funcs = {
static int anx7625_register_i2c_dummy_clients(struct anx7625_data *ctx,
struct i2c_client *client)
{
+ int err = 0;
+
ctx->i2c.tx_p0_client = i2c_new_dummy_device(client->adapter,
TX_P0_ADDR >> 1);
- if (!ctx->i2c.tx_p0_client)
- return -ENOMEM;
+ if (IS_ERR(ctx->i2c.tx_p0_client))
+ return PTR_ERR(ctx->i2c.tx_p0_client);
ctx->i2c.tx_p1_client = i2c_new_dummy_device(client->adapter,
TX_P1_ADDR >> 1);
- if (!ctx->i2c.tx_p1_client)
+ if (IS_ERR(ctx->i2c.tx_p1_client)) {
+ err = PTR_ERR(ctx->i2c.tx_p1_client);
goto free_tx_p0;
+ }
ctx->i2c.tx_p2_client = i2c_new_dummy_device(client->adapter,
TX_P2_ADDR >> 1);
- if (!ctx->i2c.tx_p2_client)
+ if (IS_ERR(ctx->i2c.tx_p2_client)) {
+ err = PTR_ERR(ctx->i2c.tx_p2_client);
goto free_tx_p1;
+ }
ctx->i2c.rx_p0_client = i2c_new_dummy_device(client->adapter,
RX_P0_ADDR >> 1);
- if (!ctx->i2c.rx_p0_client)
+ if (IS_ERR(ctx->i2c.rx_p0_client)) {
+ err = PTR_ERR(ctx->i2c.rx_p0_client);
goto free_tx_p2;
+ }
ctx->i2c.rx_p1_client = i2c_new_dummy_device(client->adapter,
RX_P1_ADDR >> 1);
- if (!ctx->i2c.rx_p1_client)
+ if (IS_ERR(ctx->i2c.rx_p1_client)) {
+ err = PTR_ERR(ctx->i2c.rx_p1_client);
goto free_rx_p0;
+ }
ctx->i2c.rx_p2_client = i2c_new_dummy_device(client->adapter,
RX_P2_ADDR >> 1);
- if (!ctx->i2c.rx_p2_client)
+ if (IS_ERR(ctx->i2c.rx_p2_client)) {
+ err = PTR_ERR(ctx->i2c.rx_p2_client);
goto free_rx_p1;
+ }
ctx->i2c.tcpc_client = i2c_new_dummy_device(client->adapter,
TCPC_INTERFACE_ADDR >> 1);
- if (!ctx->i2c.tcpc_client)
+ if (IS_ERR(ctx->i2c.tcpc_client)) {
+ err = PTR_ERR(ctx->i2c.tcpc_client);
goto free_rx_p2;
+ }
return 0;
@@ -1687,7 +1701,7 @@ static int anx7625_register_i2c_dummy_clients(struct anx7625_data *ctx,
free_tx_p0:
i2c_unregister_device(ctx->i2c.tx_p0_client);
- return -ENOMEM;
+ return err;
}
static void anx7625_unregister_i2c_dummy_clients(struct anx7625_data *ctx)
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/bridge: anx7625: Fix null vs IS_ERR() checking in anx7625_register_i2c_dummy_clients
2021-12-22 8:33 ` Miaoqian Lin
@ 2022-01-04 14:29 ` Robert Foss
-1 siblings, 0 replies; 6+ messages in thread
From: Robert Foss @ 2022-01-04 14:29 UTC (permalink / raw)
To: Miaoqian Lin
Cc: Andrzej Hajda, Neil Armstrong, Laurent Pinchart, Jonas Karlman,
Jernej Skrabec, David Airlie, Daniel Vetter, Pi-Hsun Shih,
Xin Ji, Sam Ravnborg, Tzung-Bi Shih, Hsin-Yi Wang,
Nicolas Boichat, dri-devel, linux-kernel
Hey Miaoqian,
Thanks for submitting this fix.
On Wed, 22 Dec 2021 at 09:33, Miaoqian Lin <linmq006@gmail.com> wrote:
>
> Since i2c_new_client_device() function return error pointers.
> The i2c_new_dummy_device() function does not return NULL, It returns error
> pointers too. Using IS_ERR() to check the return value to fix this.
>
> Fixes: 8bdfc5dae4e3("drm/bridge: anx7625: Add anx7625 MIPI DSI/DPI to DP")
> Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
> ---
> drivers/gpu/drm/bridge/analogix/anx7625.c | 32 ++++++++++++++++-------
> 1 file changed, 23 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c
> index 1a871f6b6822..eb72aa6aedd6 100644
> --- a/drivers/gpu/drm/bridge/analogix/anx7625.c
> +++ b/drivers/gpu/drm/bridge/analogix/anx7625.c
> @@ -1637,40 +1637,54 @@ static const struct drm_bridge_funcs anx7625_bridge_funcs = {
> static int anx7625_register_i2c_dummy_clients(struct anx7625_data *ctx,
> struct i2c_client *client)
> {
> + int err = 0;
> +
> ctx->i2c.tx_p0_client = i2c_new_dummy_device(client->adapter,
> TX_P0_ADDR >> 1);
> - if (!ctx->i2c.tx_p0_client)
> - return -ENOMEM;
> + if (IS_ERR(ctx->i2c.tx_p0_client))
> + return PTR_ERR(ctx->i2c.tx_p0_client);
>
> ctx->i2c.tx_p1_client = i2c_new_dummy_device(client->adapter,
> TX_P1_ADDR >> 1);
> - if (!ctx->i2c.tx_p1_client)
> + if (IS_ERR(ctx->i2c.tx_p1_client)) {
> + err = PTR_ERR(ctx->i2c.tx_p1_client);
> goto free_tx_p0;
> + }
>
> ctx->i2c.tx_p2_client = i2c_new_dummy_device(client->adapter,
> TX_P2_ADDR >> 1);
> - if (!ctx->i2c.tx_p2_client)
> + if (IS_ERR(ctx->i2c.tx_p2_client)) {
> + err = PTR_ERR(ctx->i2c.tx_p2_client);
> goto free_tx_p1;
> + }
>
> ctx->i2c.rx_p0_client = i2c_new_dummy_device(client->adapter,
> RX_P0_ADDR >> 1);
> - if (!ctx->i2c.rx_p0_client)
> + if (IS_ERR(ctx->i2c.rx_p0_client)) {
> + err = PTR_ERR(ctx->i2c.rx_p0_client);
> goto free_tx_p2;
> + }
>
> ctx->i2c.rx_p1_client = i2c_new_dummy_device(client->adapter,
> RX_P1_ADDR >> 1);
> - if (!ctx->i2c.rx_p1_client)
> + if (IS_ERR(ctx->i2c.rx_p1_client)) {
> + err = PTR_ERR(ctx->i2c.rx_p1_client);
> goto free_rx_p0;
> + }
>
> ctx->i2c.rx_p2_client = i2c_new_dummy_device(client->adapter,
> RX_P2_ADDR >> 1);
> - if (!ctx->i2c.rx_p2_client)
> + if (IS_ERR(ctx->i2c.rx_p2_client)) {
> + err = PTR_ERR(ctx->i2c.rx_p2_client);
> goto free_rx_p1;
> + }
>
> ctx->i2c.tcpc_client = i2c_new_dummy_device(client->adapter,
> TCPC_INTERFACE_ADDR >> 1);
> - if (!ctx->i2c.tcpc_client)
> + if (IS_ERR(ctx->i2c.tcpc_client)) {
> + err = PTR_ERR(ctx->i2c.tcpc_client);
> goto free_rx_p2;
> + }
>
> return 0;
>
> @@ -1687,7 +1701,7 @@ static int anx7625_register_i2c_dummy_clients(struct anx7625_data *ctx,
> free_tx_p0:
> i2c_unregister_device(ctx->i2c.tx_p0_client);
>
> - return -ENOMEM;
> + return err;
> }
>
> static void anx7625_unregister_i2c_dummy_clients(struct anx7625_data *ctx)
> --
> 2.17.1
>
Reviewed-by: Robert Foss <robert.foss@linaro.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/bridge: anx7625: Fix null vs IS_ERR() checking in anx7625_register_i2c_dummy_clients
@ 2022-01-04 14:29 ` Robert Foss
0 siblings, 0 replies; 6+ messages in thread
From: Robert Foss @ 2022-01-04 14:29 UTC (permalink / raw)
To: Miaoqian Lin
Cc: Nicolas Boichat, Pi-Hsun Shih, Jonas Karlman, David Airlie,
dri-devel, Neil Armstrong, linux-kernel, Jernej Skrabec,
Andrzej Hajda, Laurent Pinchart, Hsin-Yi Wang, Tzung-Bi Shih,
Sam Ravnborg, Xin Ji
Hey Miaoqian,
Thanks for submitting this fix.
On Wed, 22 Dec 2021 at 09:33, Miaoqian Lin <linmq006@gmail.com> wrote:
>
> Since i2c_new_client_device() function return error pointers.
> The i2c_new_dummy_device() function does not return NULL, It returns error
> pointers too. Using IS_ERR() to check the return value to fix this.
>
> Fixes: 8bdfc5dae4e3("drm/bridge: anx7625: Add anx7625 MIPI DSI/DPI to DP")
> Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
> ---
> drivers/gpu/drm/bridge/analogix/anx7625.c | 32 ++++++++++++++++-------
> 1 file changed, 23 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c
> index 1a871f6b6822..eb72aa6aedd6 100644
> --- a/drivers/gpu/drm/bridge/analogix/anx7625.c
> +++ b/drivers/gpu/drm/bridge/analogix/anx7625.c
> @@ -1637,40 +1637,54 @@ static const struct drm_bridge_funcs anx7625_bridge_funcs = {
> static int anx7625_register_i2c_dummy_clients(struct anx7625_data *ctx,
> struct i2c_client *client)
> {
> + int err = 0;
> +
> ctx->i2c.tx_p0_client = i2c_new_dummy_device(client->adapter,
> TX_P0_ADDR >> 1);
> - if (!ctx->i2c.tx_p0_client)
> - return -ENOMEM;
> + if (IS_ERR(ctx->i2c.tx_p0_client))
> + return PTR_ERR(ctx->i2c.tx_p0_client);
>
> ctx->i2c.tx_p1_client = i2c_new_dummy_device(client->adapter,
> TX_P1_ADDR >> 1);
> - if (!ctx->i2c.tx_p1_client)
> + if (IS_ERR(ctx->i2c.tx_p1_client)) {
> + err = PTR_ERR(ctx->i2c.tx_p1_client);
> goto free_tx_p0;
> + }
>
> ctx->i2c.tx_p2_client = i2c_new_dummy_device(client->adapter,
> TX_P2_ADDR >> 1);
> - if (!ctx->i2c.tx_p2_client)
> + if (IS_ERR(ctx->i2c.tx_p2_client)) {
> + err = PTR_ERR(ctx->i2c.tx_p2_client);
> goto free_tx_p1;
> + }
>
> ctx->i2c.rx_p0_client = i2c_new_dummy_device(client->adapter,
> RX_P0_ADDR >> 1);
> - if (!ctx->i2c.rx_p0_client)
> + if (IS_ERR(ctx->i2c.rx_p0_client)) {
> + err = PTR_ERR(ctx->i2c.rx_p0_client);
> goto free_tx_p2;
> + }
>
> ctx->i2c.rx_p1_client = i2c_new_dummy_device(client->adapter,
> RX_P1_ADDR >> 1);
> - if (!ctx->i2c.rx_p1_client)
> + if (IS_ERR(ctx->i2c.rx_p1_client)) {
> + err = PTR_ERR(ctx->i2c.rx_p1_client);
> goto free_rx_p0;
> + }
>
> ctx->i2c.rx_p2_client = i2c_new_dummy_device(client->adapter,
> RX_P2_ADDR >> 1);
> - if (!ctx->i2c.rx_p2_client)
> + if (IS_ERR(ctx->i2c.rx_p2_client)) {
> + err = PTR_ERR(ctx->i2c.rx_p2_client);
> goto free_rx_p1;
> + }
>
> ctx->i2c.tcpc_client = i2c_new_dummy_device(client->adapter,
> TCPC_INTERFACE_ADDR >> 1);
> - if (!ctx->i2c.tcpc_client)
> + if (IS_ERR(ctx->i2c.tcpc_client)) {
> + err = PTR_ERR(ctx->i2c.tcpc_client);
> goto free_rx_p2;
> + }
>
> return 0;
>
> @@ -1687,7 +1701,7 @@ static int anx7625_register_i2c_dummy_clients(struct anx7625_data *ctx,
> free_tx_p0:
> i2c_unregister_device(ctx->i2c.tx_p0_client);
>
> - return -ENOMEM;
> + return err;
> }
>
> static void anx7625_unregister_i2c_dummy_clients(struct anx7625_data *ctx)
> --
> 2.17.1
>
Reviewed-by: Robert Foss <robert.foss@linaro.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/bridge: anx7625: Fix null vs IS_ERR() checking in anx7625_register_i2c_dummy_clients
2022-01-04 14:29 ` Robert Foss
@ 2022-01-04 14:32 ` Robert Foss
-1 siblings, 0 replies; 6+ messages in thread
From: Robert Foss @ 2022-01-04 14:32 UTC (permalink / raw)
To: Miaoqian Lin
Cc: Andrzej Hajda, Neil Armstrong, Laurent Pinchart, Jonas Karlman,
Jernej Skrabec, David Airlie, Daniel Vetter, Pi-Hsun Shih,
Xin Ji, Sam Ravnborg, Tzung-Bi Shih, Hsin-Yi Wang,
Nicolas Boichat, dri-devel, linux-kernel
Applied to drm-misc-next
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/bridge: anx7625: Fix null vs IS_ERR() checking in anx7625_register_i2c_dummy_clients
@ 2022-01-04 14:32 ` Robert Foss
0 siblings, 0 replies; 6+ messages in thread
From: Robert Foss @ 2022-01-04 14:32 UTC (permalink / raw)
To: Miaoqian Lin
Cc: Nicolas Boichat, Pi-Hsun Shih, Jonas Karlman, David Airlie,
dri-devel, Neil Armstrong, linux-kernel, Jernej Skrabec,
Andrzej Hajda, Laurent Pinchart, Hsin-Yi Wang, Tzung-Bi Shih,
Sam Ravnborg, Xin Ji
Applied to drm-misc-next
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-01-04 14:33 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-22 8:33 [PATCH] drm/bridge: anx7625: Fix null vs IS_ERR() checking in anx7625_register_i2c_dummy_clients Miaoqian Lin
2021-12-22 8:33 ` Miaoqian Lin
2022-01-04 14:29 ` Robert Foss
2022-01-04 14:29 ` Robert Foss
2022-01-04 14:32 ` Robert Foss
2022-01-04 14:32 ` Robert Foss
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.