lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 136/453] media: v4l2-fwnode: Return -EINVAL for invalid bus-type
    Date
    From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>

    [ Upstream commit 69baf338fc16a4d55c78da8874ce3f06feb38c78 ]

    Return -EINVAL if invalid bus-type is detected while parsing endpoints.

    Fixes: 26c1126c9b56 ("media: v4l: fwnode: Use media bus type for bus parser selection")
    Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
    Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/v4l2-core/v4l2-fwnode.c | 6 +++++-
    include/media/v4l2-mediabus.h | 2 ++
    2 files changed, 7 insertions(+), 1 deletion(-)

    diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
    index 3bd1888787eb3..48c3b9f72722a 100644
    --- a/drivers/media/v4l2-core/v4l2-fwnode.c
    +++ b/drivers/media/v4l2-core/v4l2-fwnode.c
    @@ -93,7 +93,7 @@ v4l2_fwnode_bus_type_to_mbus(enum v4l2_fwnode_bus_type type)
    const struct v4l2_fwnode_bus_conv *conv =
    get_v4l2_fwnode_bus_conv_by_fwnode_bus(type);

    - return conv ? conv->mbus_type : V4L2_MBUS_UNKNOWN;
    + return conv ? conv->mbus_type : V4L2_MBUS_INVALID;
    }

    static const char *
    @@ -436,6 +436,10 @@ static int __v4l2_fwnode_endpoint_parse(struct fwnode_handle *fwnode,
    v4l2_fwnode_mbus_type_to_string(vep->bus_type),
    vep->bus_type);
    mbus_type = v4l2_fwnode_bus_type_to_mbus(bus_type);
    + if (mbus_type == V4L2_MBUS_INVALID) {
    + pr_debug("unsupported bus type %u\n", bus_type);
    + return -EINVAL;
    + }

    if (vep->bus_type != V4L2_MBUS_UNKNOWN) {
    if (mbus_type != V4L2_MBUS_UNKNOWN &&
    diff --git a/include/media/v4l2-mediabus.h b/include/media/v4l2-mediabus.h
    index 45f88f0248c4e..c072ed1418113 100644
    --- a/include/media/v4l2-mediabus.h
    +++ b/include/media/v4l2-mediabus.h
    @@ -78,6 +78,7 @@
    * @V4L2_MBUS_CCP2: CCP2 (Compact Camera Port 2)
    * @V4L2_MBUS_CSI2_DPHY: MIPI CSI-2 serial interface, with D-PHY
    * @V4L2_MBUS_CSI2_CPHY: MIPI CSI-2 serial interface, with C-PHY
    + * @V4L2_MBUS_INVALID: invalid bus type (keep as last)
    */
    enum v4l2_mbus_type {
    V4L2_MBUS_UNKNOWN,
    @@ -87,6 +88,7 @@ enum v4l2_mbus_type {
    V4L2_MBUS_CCP2,
    V4L2_MBUS_CSI2_DPHY,
    V4L2_MBUS_CSI2_CPHY,
    + V4L2_MBUS_INVALID,
    };

    /**
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 14:45    [W:4.288 / U:0.164 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site