Merge remote-tracking branch 'scott/next' into next

[firefly-linux-kernel-4.4.55.git] / drivers / input / touchscreen / zforce_ts.c

diff --git a/drivers/input/touchscreen/zforce_ts.c b/drivers/input/touchscreen/zforce_ts.c
index aa127ba392a45cbabe9f95180876543dd6441865..2175f341900204f8ba0c3ba42c99973603fc6b09 100644 (file)
--- a/drivers/input/touchscreen/zforce_ts.c
+++ b/drivers/input/touchscreen/zforce_ts.c
@@ -279,7 +279,8 @@ static int zforce_start(struct zforce_ts *ts)
                goto error;
        }
 
-       if (zforce_setconfig(ts, SETCONFIG_DUALTOUCH)) {
+       ret = zforce_setconfig(ts, SETCONFIG_DUALTOUCH);
+       if (ret) {
                dev_err(&client->dev, "Unable to set config\n");
                goto error;
        }