lkml.org 
[lkml]   [2018]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.9 042/219] omapfb: dss: Handle return errors in dss_init_ports()
    Date
    From: Arvind Yadav <arvind.yadav.cs@gmail.com>

    [ Upstream commit 0348aaa34412e24ebe622a2b1b013e68d6ae5412 ]

    dss_init_ports() is not handling return errors from dpi_init_port() and
    sdi_init_port(). It is also always returning 0 currently which results in
    part of error handling code in dss_bind() being unused.

    Fix dss_init_ports() to handle return errors from dpi_init_port() and
    sdi_init_port().

    Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
    Cc: tomi.valkeinen@ti.com
    [b.zolnierkie: fail early on errors, minor fixups]
    Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/video/fbdev/omap2/omapfb/dss/dss.c | 16 +++++++++++-----
    1 file changed, 11 insertions(+), 5 deletions(-)

    diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss.c b/drivers/video/fbdev/omap2/omapfb/dss/dss.c
    index 47d7f69ad9ad..48c6500c24e1 100644
    --- a/drivers/video/fbdev/omap2/omapfb/dss/dss.c
    +++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.c
    @@ -941,11 +941,13 @@ static int dss_init_features(struct platform_device *pdev)
    return 0;
    }

    +static void dss_uninit_ports(struct platform_device *pdev);
    +
    static int dss_init_ports(struct platform_device *pdev)
    {
    struct device_node *parent = pdev->dev.of_node;
    struct device_node *port;
    - int r;
    + int r, ret = 0;

    if (parent == NULL)
    return 0;
    @@ -972,17 +974,21 @@ static int dss_init_ports(struct platform_device *pdev)

    switch (port_type) {
    case OMAP_DISPLAY_TYPE_DPI:
    - dpi_init_port(pdev, port);
    + ret = dpi_init_port(pdev, port);
    break;
    case OMAP_DISPLAY_TYPE_SDI:
    - sdi_init_port(pdev, port);
    + ret = sdi_init_port(pdev, port);
    break;
    default:
    break;
    }
    - } while ((port = omapdss_of_get_next_port(parent, port)) != NULL);
    + } while (!ret &&
    + (port = omapdss_of_get_next_port(parent, port)) != NULL);

    - return 0;
    + if (ret)
    + dss_uninit_ports(pdev);
    +
    + return ret;
    }

    static void dss_uninit_ports(struct platform_device *pdev)
    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-04 01:00    [W:2.309 / U:0.300 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site