2021-01-27 20:57:17

by Menglong Dong

Subject: [PATCH v2] drm/omap: dsi: fix unreachable code in dsi_vc_send_short()

From: Menglong Dong <[email protected]>

The 'r' in dsi_vc_send_short() is of type 'unsigned int', so the
'r < 0' can't be true.

Fix this by introducing a 'err' of type 'int' insteaded.

Fixes: 1ed6253856cb ("drm/omap: dsi: switch dsi_vc_send_long/short to mipi_dsi_msg")

Signed-off-by: Menglong Dong <[email protected]>
Reviewed-by: Sebastian Reichel <[email protected]>
---
v2:
- remove word wrap in 'Fixes' tag
---
drivers/gpu/drm/omapdrm/dss/dsi.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
index 8e11612f5fe1..febcc87ddfe1 100644
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -2149,11 +2149,12 @@ static int dsi_vc_send_short(struct dsi_data *dsi, int vc,
const struct mipi_dsi_msg *msg)
{
struct mipi_dsi_packet pkt;
+ int err;
u32 r;

- r = mipi_dsi_create_packet(&pkt, msg);
- if (r < 0)
- return r;
+ err = mipi_dsi_create_packet(&pkt, msg);
+ if (err)
+ return err;

WARN_ON(!dsi_bus_is_locked(dsi));

--
2.25.1

2021-01-28 00:01:53

by Tomi Valkeinen

Subject: Re: [PATCH v2] drm/omap: dsi: fix unreachable code in dsi_vc_send_short()

On 27/01/2021 03:51, [email protected] wrote:
> From: Menglong Dong <[email protected]>
>
> The 'r' in dsi_vc_send_short() is of type 'unsigned int', so the
> 'r < 0' can't be true.
>
> Fix this by introducing a 'err' of type 'int' insteaded.
>
> Fixes: 1ed6253856cb ("drm/omap: dsi: switch dsi_vc_send_long/short to mipi_dsi_msg")
>
> Signed-off-by: Menglong Dong <[email protected]>
> Reviewed-by: Sebastian Reichel <[email protected]>
> ---
> v2:
> - remove word wrap in 'Fixes' tag
> ---
> drivers/gpu/drm/omapdrm/dss/dsi.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
> index 8e11612f5fe1..febcc87ddfe1 100644
> --- a/drivers/gpu/drm/omapdrm/dss/dsi.c
> +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
> @@ -2149,11 +2149,12 @@ static int dsi_vc_send_short(struct dsi_data *dsi, int vc,
> const struct mipi_dsi_msg *msg)
> {
> struct mipi_dsi_packet pkt;
> + int err;
> u32 r;
>
> - r = mipi_dsi_create_packet(&pkt, msg);
> - if (r < 0)
> - return r;
> + err = mipi_dsi_create_packet(&pkt, msg);
> + if (err)
> + return err;
>
> WARN_ON(!dsi_bus_is_locked(dsi));
>

Thanks! I'll apply to drm-misc-next.

Tomi