aboutsummaryrefslogtreecommitdiff
path: root/drivers/gator/gator_events_mmapped.c
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2014-10-30 18:07:34 +0000
committerJon Medhurst <tixy@linaro.org>2014-10-30 18:07:34 +0000
commit715db954c8f2d97a6742ff13be91c99db22135e9 (patch)
treee8cd428e662cdeec5e8376d1aac3ab07eb5edbce /drivers/gator/gator_events_mmapped.c
parented30f24e8d07d30aa3e69d1f508f4d7bd2e8ea14 (diff)
parent560679f5923495a049796b7501038911bd8eb2cb (diff)
downloadlinux-linaro-stable-715db954c8f2d97a6742ff13be91c99db22135e9.tar.gz
Merge branch 'lsk-3.10-gator-5.20' into lsk-3.10-gator
Diffstat (limited to 'drivers/gator/gator_events_mmapped.c')
-rw-r--r--drivers/gator/gator_events_mmapped.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gator/gator_events_mmapped.c b/drivers/gator/gator_events_mmapped.c
index 5bc01c42c3a2..6b2af995ed41 100644
--- a/drivers/gator/gator_events_mmapped.c
+++ b/drivers/gator/gator_events_mmapped.c
@@ -103,7 +103,7 @@ static int mmapped_simulate(int counter, int delta_in_us)
switch (counter) {
case 0: /* sort-of-sine */
{
- static int t = 0;
+ static int t;
int x;
t += delta_in_us;
@@ -140,7 +140,7 @@ static int mmapped_simulate(int counter, int delta_in_us)
break;
case 2: /* PWM signal */
{
- static int dc, x, t = 0;
+ static int dc, x, t;
t += delta_in_us;
if (t > 1000000)
@@ -157,7 +157,7 @@ static int mmapped_simulate(int counter, int delta_in_us)
return result;
}
-static int gator_events_mmapped_read(int **buffer)
+static int gator_events_mmapped_read(int **buffer, bool sched_switch)
{
int i;
int len = 0;