OSDN Git Service

[media] DaVinci-VPFE-Capture: Delete an unnecessary variable initialisation in vpfe_p...
authorMarkus Elfring <elfring@users.sourceforge.net>
Wed, 12 Oct 2016 08:30:28 +0000 (05:30 -0300)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Wed, 16 Nov 2016 14:43:33 +0000 (12:43 -0200)
* Return an error code as a constant after a failed call of
  the function "vpfe_initialize".

* The local variable "ret" will be set then to an appropriate value
  a bit later. Thus omit the explicit initialisation at the beginning.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/platform/davinci/vpfe_capture.c

index 9109a28..cee14aa 100644 (file)
@@ -1817,7 +1817,7 @@ static int vpfe_probe(struct platform_device *pdev)
        struct vpfe_device *vpfe_dev;
        struct i2c_adapter *i2c_adap;
        struct video_device *vfd;
-       int ret = -ENOMEM, i, j;
+       int ret, i, j;
        int num_subdevs = 0;
 
        /* Get the pointer to the device object */
@@ -1826,7 +1826,7 @@ static int vpfe_probe(struct platform_device *pdev)
        if (!vpfe_dev) {
                v4l2_err(pdev->dev.driver,
                        "Failed to allocate memory for vpfe_dev\n");
-               return ret;
+               return -ENOMEM;
        }
 
        vpfe_dev->pdev = &pdev->dev;