lkml.org 
[lkml]   [2018]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 083/111] gpu: ipu-v3: csi: pass back mbus_code_to_bus_cfg error codes
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>

    [ Upstream commit d36d0e6309dd8137cf438cbb680e72eb63c81425 ]

    mbus_code_to_bus_cfg() can fail on unknown mbus codes; pass back the
    error to the caller.

    Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
    Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
    [p.zabel@pengutronix.de - renamed rc to ret for consistency]
    Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/gpu/ipu-v3/ipu-csi.c | 20 ++++++++++++++++----
    1 file changed, 16 insertions(+), 4 deletions(-)

    --- a/drivers/gpu/ipu-v3/ipu-csi.c
    +++ b/drivers/gpu/ipu-v3/ipu-csi.c
    @@ -316,13 +316,17 @@ static int mbus_code_to_bus_cfg(struct i
    /*
    * Fill a CSI bus config struct from mbus_config and mbus_framefmt.
    */
    -static void fill_csi_bus_cfg(struct ipu_csi_bus_config *csicfg,
    +static int fill_csi_bus_cfg(struct ipu_csi_bus_config *csicfg,
    struct v4l2_mbus_config *mbus_cfg,
    struct v4l2_mbus_framefmt *mbus_fmt)
    {
    + int ret;
    +
    memset(csicfg, 0, sizeof(*csicfg));

    - mbus_code_to_bus_cfg(csicfg, mbus_fmt->code);
    + ret = mbus_code_to_bus_cfg(csicfg, mbus_fmt->code);
    + if (ret < 0)
    + return ret;

    switch (mbus_cfg->type) {
    case V4L2_MBUS_PARALLEL:
    @@ -353,6 +357,8 @@ static void fill_csi_bus_cfg(struct ipu_
    /* will never get here, keep compiler quiet */
    break;
    }
    +
    + return 0;
    }

    int ipu_csi_init_interface(struct ipu_csi *csi,
    @@ -362,8 +368,11 @@ int ipu_csi_init_interface(struct ipu_cs
    struct ipu_csi_bus_config cfg;
    unsigned long flags;
    u32 width, height, data = 0;
    + int ret;

    - fill_csi_bus_cfg(&cfg, mbus_cfg, mbus_fmt);
    + ret = fill_csi_bus_cfg(&cfg, mbus_cfg, mbus_fmt);
    + if (ret < 0)
    + return ret;

    /* set default sensor frame width and height */
    width = mbus_fmt->width;
    @@ -567,11 +576,14 @@ int ipu_csi_set_mipi_datatype(struct ipu
    struct ipu_csi_bus_config cfg;
    unsigned long flags;
    u32 temp;
    + int ret;

    if (vc > 3)
    return -EINVAL;

    - mbus_code_to_bus_cfg(&cfg, mbus_fmt->code);
    + ret = mbus_code_to_bus_cfg(&cfg, mbus_fmt->code);
    + if (ret < 0)
    + return ret;

    spin_lock_irqsave(&csi->lock, flags);


    \
     
     \ /
      Last update: 2018-09-24 14:06    [W:4.075 / U:0.256 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site