lkml.org 
[lkml]   [2015]   [Aug]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 07/11] drm: fix error return code
    Date
    Return a negative error code on failure.

    A simplified version of the semantic match that finds this problem is as
    follows: (http://coccinelle.lip6.fr/)

    // <smpl>
    @@
    identifier ret; expression e1,e2;
    @@
    (
    if (\(ret < 0\|ret != 0\))
    { ... return ret; }
    |
    ret = 0
    )
    ... when != ret = e1
    when != &ret
    *if(...)
    {
    ... when != ret = e2
    when forall
    return ret;
    }
    // </smpl>

    Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>

    ---
    drivers/gpu/drm/gma500/psb_drv.c | 8 ++++++--
    drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 1 +
    2 files changed, 7 insertions(+), 2 deletions(-)

    diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c
    index 92e7e57..4eff0d6 100644
    --- a/drivers/gpu/drm/gma500/psb_drv.c
    +++ b/drivers/gpu/drm/gma500/psb_drv.c
    @@ -326,12 +326,16 @@ static int psb_driver_load(struct drm_device *dev, unsigned long flags)
    goto out_err;

    dev_priv->mmu = psb_mmu_driver_init(dev, 1, 0, 0);
    - if (!dev_priv->mmu)
    + if (!dev_priv->mmu) {
    + ret = -ENOMEM;
    goto out_err;
    + }

    dev_priv->pf_pd = psb_mmu_alloc_pd(dev_priv->mmu, 1, 0);
    - if (!dev_priv->pf_pd)
    + if (!dev_priv->pf_pd) {
    + ret = -ENOMEM;
    goto out_err;
    + }

    ret = psb_do_init(dev);
    if (ret)
    diff --git a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
    index 7841970..58a00b5 100644
    --- a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
    +++ b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
    @@ -703,6 +703,7 @@ static int omap_dmm_probe(struct platform_device *dev)
    &omap_dmm->refill_pa, GFP_KERNEL);
    if (!omap_dmm->refill_va) {
    dev_err(&dev->dev, "could not allocate refill memory\n");
    + ret = -ENOMEM;
    goto fail;
    }



    \
     
     \ /
      Last update: 2015-08-23 02:41    [W:4.427 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site