summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Dyer <nick.dyer@itdev.co.uk>2014-09-09 16:13:30 +0100
committerNick Dyer <nick.dyer@itdev.co.uk>2014-09-09 16:27:31 +0100
commit29c8ab9dc45ef3bc5cda7fad055121fd421e6a54 (patch)
treed0520ca03dbfb940277ef2f7979c67e665e09be3
parent64c2e0ff9b77ea3fc47489f8d152b472031c32af (diff)
downloadolio-linux-3.10-29c8ab9dc45ef3bc5cda7fad055121fd421e6a54.tar.xz
olio-linux-3.10-29c8ab9dc45ef3bc5cda7fad055121fd421e6a54.zip
Input: atmel_mxt_ts - fix checkpatch warning with bare else
Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk>
-rw-r--r--drivers/input/touchscreen/atmel_mxt_ts.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index f16e5a845f4..4df1f0e7d45 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -2992,6 +2992,7 @@ static ssize_t mxt_debug_v2_enable_store(struct device *dev,
{
struct mxt_data *data = dev_get_drvdata(dev);
u8 i;
+ ssize_t ret;
if (kstrtou8(buf, 0, &i) == 0 && i < 2) {
if (i == 1)
@@ -2999,11 +3000,13 @@ static ssize_t mxt_debug_v2_enable_store(struct device *dev,
else
mxt_debug_msg_disable(data);
- return count;
+ ret = count;
} else {
dev_dbg(dev, "debug_enabled write error\n");
- return -EINVAL;
+ ret = -EINVAL;
}
+
+ return ret;
}
static ssize_t mxt_debug_enable_store(struct device *dev,
@@ -3011,16 +3014,19 @@ static ssize_t mxt_debug_enable_store(struct device *dev,
{
struct mxt_data *data = dev_get_drvdata(dev);
u8 i;
+ ssize_t ret;
if (kstrtou8(buf, 0, &i) == 0 && i < 2) {
data->debug_enabled = (i == 1);
dev_dbg(dev, "%s\n", i ? "debug enabled" : "debug disabled");
- return count;
+ ret = count;
} else {
dev_dbg(dev, "debug_enabled write error\n");
- return -EINVAL;
+ ret = -EINVAL;
}
+
+ return ret;
}
static int mxt_check_mem_access_params(struct mxt_data *data, loff_t off,