[media] i2c: Delete an error messages for failed memory allocation
authorMarkus Elfring <elfring@users.sourceforge.net>
Sat, 2 Sep 2017 14:07:31 +0000 (11:07 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Wed, 4 Oct 2017 20:15:22 +0000 (17:15 -0300)
Omit extra messages for memory allocation failures.

This issue was detected by using the Coccinelle software.

[mchehab@s-opensource.com: merged similar patches]
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/i2c/ov2640.c
drivers/media/i2c/ov6650.c
drivers/media/i2c/soc_camera/ov9640.c
drivers/media/i2c/soc_camera/ov9740.c

index 5f013c8..c0d0c50 100644 (file)
@@ -1098,11 +1098,8 @@ static int ov2640_probe(struct i2c_client *client,
        }
 
        priv = devm_kzalloc(&client->dev, sizeof(struct ov2640_priv), GFP_KERNEL);
-       if (!priv) {
-               dev_err(&adapter->dev,
-                       "Failed to allocate memory for private data!\n");
+       if (!priv)
                return -ENOMEM;
-       }
 
        if (client->dev.of_node) {
                priv->clk = devm_clk_get(&client->dev, "xvclk");
index 768f295..8975d16 100644 (file)
@@ -951,11 +951,8 @@ static int ov6650_probe(struct i2c_client *client,
        int ret;
 
        priv = devm_kzalloc(&client->dev, sizeof(*priv), GFP_KERNEL);
-       if (!priv) {
-               dev_err(&client->dev,
-                       "Failed to allocate memory for private data!\n");
+       if (!priv)
                return -ENOMEM;
-       }
 
        v4l2_i2c_subdev_init(&priv->subdev, client, &ov6650_subdev_ops);
        v4l2_ctrl_handler_init(&priv->hdl, 13);
index dafea6d..8835008 100644 (file)
@@ -676,11 +676,8 @@ static int ov9640_probe(struct i2c_client *client,
        }
 
        priv = devm_kzalloc(&client->dev, sizeof(struct ov9640_priv), GFP_KERNEL);
-       if (!priv) {
-               dev_err(&client->dev,
-                       "Failed to allocate memory for private data!\n");
+       if (!priv)
                return -ENOMEM;
-       }
 
        v4l2_i2c_subdev_init(&priv->subdev, client, &ov9640_subdev_ops);
 
index cc07b7a..f44f5da 100644 (file)
@@ -936,10 +936,8 @@ static int ov9740_probe(struct i2c_client *client,
        }
 
        priv = devm_kzalloc(&client->dev, sizeof(struct ov9740_priv), GFP_KERNEL);
-       if (!priv) {
-               dev_err(&client->dev, "Failed to allocate private data!\n");
+       if (!priv)
                return -ENOMEM;
-       }
 
        v4l2_i2c_subdev_init(&priv->subdev, client, &ov9740_subdev_ops);
        v4l2_ctrl_handler_init(&priv->hdl, 13);