[PATCH] Input:Flush client events on clk_type change

@@ -62,27 +62,6 @@ struct evdev_client {
 	struct input_event buffer[];
 };
 
-static int evdev_set_clk_type(struct evdev_client *client, unsigned int clkid)
-{
-	switch (clkid) {
-
-	case CLOCK_REALTIME:
-		client->clk_type = EV_CLK_REAL;
-		break;
-	case CLOCK_MONOTONIC:
-		client->clk_type = EV_CLK_MONO;
-		break;
-	case CLOCK_BOOTTIME:
-		client->clk_type = EV_CLK_BOOT;
-		break;
-	default:
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
-/* flush queued events of type @type, caller must hold client->buffer_lock */
 static void __evdev_flush_queue(struct evdev_client *client, unsigned int type)
 {
 	unsigned int i, head, num;

@@ -160,6 +139,41 @@ static void evdev_queue_syn_dropped(struct evdev_client *client)
 	spin_unlock_irqrestore(&client->buffer_lock, flags);
 }
 
+static int evdev_set_clk_type(struct evdev_client *client,
+			struct input_dev *dev, unsigned int clkid)
+{
+	if (client->clk_type == clkid)
+		return 0;
+
+	switch (clkid) {
+
+	case CLOCK_REALTIME:
+		client->clk_type = EV_CLK_REAL;
+		break;
+	case CLOCK_MONOTONIC:
+		client->clk_type = EV_CLK_MONO;
+		break;
+	case CLOCK_BOOTTIME:
+		client->clk_type = EV_CLK_BOOT;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	spin_lock_irq(&dev->event_lock);
+	spin_lock(&client->buffer_lock);
+	spin_unlock(&dev->event_lock);
+
+	/* Flush clients events after clk_type is changed
+	 * and queue SYN_DROPPED event.*/
+	client->packet_head = client->head = client->tail;
+	spin_unlock_irq(&client->buffer_lock);
+
+	evdev_queue_syn_dropped(client);
+	return 0;
+}
+
+/* flush queued events of type @type, caller must hold client->buffer_lock */
 static void __pass_event(struct evdev_client *client,
 			 const struct input_event *event)
 {

@@ -908,7 +922,7 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd,
 		if (copy_from_user(&i, p, sizeof(unsigned int)))
 			return -EFAULT;
 
-		return evdev_set_clk_type(client, i);
+		return evdev_set_clk_type(client, dev, i);
 
 	case EVIOCGKEYCODE:
 		return evdev_handle_get_keycode(dev, p);