[PATCH 1/2] [media] tda18212: Delete an error message for a failed memory allocation in tda18212_probe()

From: SF Markus Elfring
Date: Sun Sep 17 2017 - 04:20:20 EST


From: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
Date: Sun, 17 Sep 2017 09:33:58 +0200

* Omit an extra message for a memory allocation failure in this function.

This issue was detected by using the Coccinelle software.

* Add a jump target so that the function "kfree" will be always called
with a non-null pointer.

Signed-off-by: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
---
drivers/media/tuners/tda18212.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/media/tuners/tda18212.c b/drivers/media/tuners/tda18212.c
index 7b8068354fea..8f89d52cd39c 100644
--- a/drivers/media/tuners/tda18212.c
+++ b/drivers/media/tuners/tda18212.c
@@ -204,6 +204,5 @@ static int tda18212_probe(struct i2c_client *client,
if (dev == NULL) {
ret = -ENOMEM;
- dev_err(&client->dev, "kzalloc() failed\n");
- goto err;
+ goto report_failure;
}

@@ -250,8 +249,9 @@ static int tda18212_probe(struct i2c_client *client,

return 0;
err:
- dev_dbg(&client->dev, "failed=%d\n", ret);
kfree(dev);
+report_failure:
+ dev_dbg(&client->dev, "failed=%d\n", ret);
return ret;
}

--
2.14.1