diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-05-24 03:06:26 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-05-24 03:06:26 -0400 |
| commit | b73077eb03f510a84b102fb97640e595a958403c (patch) | |
| tree | 8b639000418e2756bf6baece4e00e07d2534bccc /drivers/input/touchscreen/wm9713.c | |
| parent | 28350e330cfab46b60a1dbf763b678d859f9f3d9 (diff) | |
| parent | 9d2e173644bb5c42ff1b280fbdda3f195a7cf1f7 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/touchscreen/wm9713.c')
| -rw-r--r-- | drivers/input/touchscreen/wm9713.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/wm9713.c b/drivers/input/touchscreen/wm9713.c index 238b5132712e..73ec99568f12 100644 --- a/drivers/input/touchscreen/wm9713.c +++ b/drivers/input/touchscreen/wm9713.c | |||
| @@ -431,7 +431,7 @@ static int wm9713_acc_enable(struct wm97xx *wm, int enable) | |||
| 431 | dig3 = wm->dig[2]; | 431 | dig3 = wm->dig[2]; |
| 432 | 432 | ||
| 433 | if (enable) { | 433 | if (enable) { |
| 434 | /* continous mode */ | 434 | /* continuous mode */ |
| 435 | if (wm->mach_ops->acc_startup && | 435 | if (wm->mach_ops->acc_startup && |
| 436 | (ret = wm->mach_ops->acc_startup(wm)) < 0) | 436 | (ret = wm->mach_ops->acc_startup(wm)) < 0) |
| 437 | return ret; | 437 | return ret; |