2 files changed, 9 insertions, 5 deletions

diff --git a/drivers/pps/kapi.c b/drivers/pps/kapi.c
index 55f39618261b..3f89f5eba81c 100644
--- a/drivers/pps/kapi.c
+++ b/drivers/pps/kapi.c
@@ -326,8 +326,8 @@ void pps_event(int source, struct pps_ktime *ts, int event, void *data)
 
         /* Wake up if captured something */
         if (captured) {
-                pps->go = ~0;
-                wake_up_interruptible(&pps->queue);
+                pps->last_ev++;
+                wake_up_interruptible_all(&pps->queue);
 
                 kill_fasync(&pps->async_queue, SIGIO, POLL_IN);
         }
diff --git a/drivers/pps/pps.c b/drivers/pps/pps.c
index c76afb980a98..dc7e66cb2762 100644
--- a/drivers/pps/pps.c
+++ b/drivers/pps/pps.c
@@ -136,6 +136,7 @@ static long pps_cdev_ioctl(struct file *file,
 
         case PPS_FETCH: {
                 struct pps_fdata fdata;
+                unsigned int ev;
 
                 pr_debug("PPS_FETCH: source %d\n", pps->id);
 
@@ -143,11 +144,12 @@ static long pps_cdev_ioctl(struct file *file,
                 if (err)
                         return -EFAULT;
 
-                pps->go = 0;
+                ev = pps->last_ev;
 
                 /* Manage the timeout */
                 if (fdata.timeout.flags & PPS_TIME_INVALID)
-                        err = wait_event_interruptible(pps->queue, pps->go);
+                        err = wait_event_interruptible(pps->queue,
+                                        ev != pps->last_ev);
                 else {
                         unsigned long ticks;
 
@@ -159,7 +161,9 @@ static long pps_cdev_ioctl(struct file *file,
 
                         if (ticks != 0) {
                                 err = wait_event_interruptible_timeout(
-                                                pps->queue, pps->go, ticks);
+                                                pps->queue,
+                                                ev != pps->last_ev,
+                                                ticks);
                                 if (err == 0)
                                         return -ETIMEDOUT;
                         }