]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
[media] radio: fix error return code
authorJulia Lawall <Julia.Lawall@lip6.fr>
Sun, 5 Apr 2015 12:06:24 +0000 (09:06 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Fri, 1 May 2015 10:02:16 +0000 (07:02 -0300)
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>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/radio/radio-timb.c

index e6b55edc8f8de32de99cca7c0204feb8486311e1..04baafe5e901dbae109ba01214249d4450628daf 100644 (file)
@@ -138,8 +138,10 @@ static int timbradio_probe(struct platform_device *pdev)
                i2c_get_adapter(pdata->i2c_adapter), pdata->tuner, NULL);
        tr->sd_dsp = v4l2_i2c_new_subdev_board(&tr->v4l2_dev,
                i2c_get_adapter(pdata->i2c_adapter), pdata->dsp, NULL);
-       if (tr->sd_tuner == NULL || tr->sd_dsp == NULL)
+       if (tr->sd_tuner == NULL || tr->sd_dsp == NULL) {
+               err = -ENODEV;
                goto err_video_req;
+       }
 
        tr->v4l2_dev.ctrl_handler = tr->sd_dsp->ctrl_handler;