Merge branch 'next' into for-linus

First round of input updates for 3.14.
This commit is contained in:
Dmitry Torokhov
2014-01-23 08:10:44 -08:00
738 changed files with 6204 additions and 3473 deletions

View File

@@ -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;
}