From: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Date: Thu, 19 Feb 2015 19:47:07 +0000 (-0300)
Subject: [media] cx25840: fix return logic when media entity init fails
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=db749359059f3049fc5c66950e5ca85f67d7c1b0;p=deliverable%2Flinux.git

[media] cx25840: fix return logic when media entity init fails

There's no need to free state, as it was allocated via devm_kzalloc().

Also, let's return the error code, instead of something else.

Reported-by: Prabhakar Lad <prabhakar.csengg@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
---

diff --git a/drivers/media/i2c/cx25840/cx25840-core.c b/drivers/media/i2c/cx25840/cx25840-core.c
index cb4e03de9b75..185cb55253c9 100644
--- a/drivers/media/i2c/cx25840/cx25840-core.c
+++ b/drivers/media/i2c/cx25840/cx25840-core.c
@@ -5205,8 +5205,7 @@ static int cx25840_probe(struct i2c_client *client,
 				state->pads, 0);
 	if (ret < 0) {
 		v4l_info(client, "failed to initialize media entity!\n");
-		kfree(state);
-		return -ENODEV;
+		return ret;
 	}
 #endif