From: Antti Palosaari <crope@iki.fi>
Date: Sat, 6 Dec 2014 17:04:05 +0000 (-0300)
Subject: [media] si2157: simplify si2157_cmd_execute() error path
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=7cbf5d7651ca7ab91b57d194f388d8886dbe4c38;p=openwrt%2Fstaging%2Fblogic.git

[media] si2157: simplify si2157_cmd_execute() error path

Remove if () from firmware command error path as there should not be
any error prone conditional logic there. Use goto labels instead.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
---

diff --git a/drivers/media/tuners/si2157.c b/drivers/media/tuners/si2157.c
index 14d2f7363149..f7c38678f805 100644
--- a/drivers/media/tuners/si2157.c
+++ b/drivers/media/tuners/si2157.c
@@ -65,15 +65,11 @@ static int si2157_cmd_execute(struct si2157_dev *dev, struct si2157_cmd *cmd)
 		}
 	}
 
-	ret = 0;
+	mutex_unlock(&dev->i2c_mutex);
+	return 0;
 
 err_mutex_unlock:
 	mutex_unlock(&dev->i2c_mutex);
-	if (ret)
-		goto err;
-
-	return 0;
-err:
 	dev_dbg(&dev->client->dev, "failed=%d\n", ret);
 	return ret;
 }