lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 112/846] media: atomisp: fix inverted error check for ia_css_mipi_is_source_port_valid()
    Date
    From: Tsuchiya Yuto <kitakar@gmail.com>

    [ Upstream commit d21ce8c2f7bf6d737b60c09f86db141b9e8e47f0 ]

    The function ia_css_mipi_is_source_port_valid() returns true if the port
    is valid. So, we can't use the existing err variable as is.

    To fix this issue while reusing that variable, invert the return value
    when assigning it to the variable.

    Fixes: 3c0538fbad9f ("media: atomisp: get rid of most checks for ISP2401 version")
    Signed-off-by: Tsuchiya Yuto <kitakar@gmail.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    .../staging/media/atomisp/pci/sh_css_mipi.c | 24 ++++++++++++-------
    1 file changed, 15 insertions(+), 9 deletions(-)

    diff --git a/drivers/staging/media/atomisp/pci/sh_css_mipi.c b/drivers/staging/media/atomisp/pci/sh_css_mipi.c
    index 65fc93c5d56bc..c1f2f6151c5f8 100644
    --- a/drivers/staging/media/atomisp/pci/sh_css_mipi.c
    +++ b/drivers/staging/media/atomisp/pci/sh_css_mipi.c
    @@ -423,10 +423,12 @@ allocate_mipi_frames(struct ia_css_pipe *pipe,
    return 0; /* AM TODO: Check */
    }

    - if (!IS_ISP2401)
    + if (!IS_ISP2401) {
    port = (unsigned int)pipe->stream->config.source.port.port;
    - else
    - err = ia_css_mipi_is_source_port_valid(pipe, &port);
    + } else {
    + /* Returns true if port is valid. So, invert it */
    + err = !ia_css_mipi_is_source_port_valid(pipe, &port);
    + }

    assert(port < N_CSI_PORTS);

    @@ -553,10 +555,12 @@ free_mipi_frames(struct ia_css_pipe *pipe)
    return err;
    }

    - if (!IS_ISP2401)
    + if (!IS_ISP2401) {
    port = (unsigned int)pipe->stream->config.source.port.port;
    - else
    - err = ia_css_mipi_is_source_port_valid(pipe, &port);
    + } else {
    + /* Returns true if port is valid. So, invert it */
    + err = !ia_css_mipi_is_source_port_valid(pipe, &port);
    + }

    assert(port < N_CSI_PORTS);

    @@ -665,10 +669,12 @@ send_mipi_frames(struct ia_css_pipe *pipe)
    /* TODO: AM: maybe this should be returning an error. */
    }

    - if (!IS_ISP2401)
    + if (!IS_ISP2401) {
    port = (unsigned int)pipe->stream->config.source.port.port;
    - else
    - err = ia_css_mipi_is_source_port_valid(pipe, &port);
    + } else {
    + /* Returns true if port is valid. So, invert it */
    + err = !ia_css_mipi_is_source_port_valid(pipe, &port);
    + }

    assert(port < N_CSI_PORTS);

    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 23:10    [W:3.637 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site