From c45cc92eb3953d37432baf58d54c8aa4957de546 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Sat, 29 Oct 2005 11:56:13 +0100
Subject: [PATCH] --- yaml --- r: 10911 b: refs/heads/master c:
 018a2cdf1e633497bb4f01eb86a7cbffa611776d h: refs/heads/master i:   10909:
 02883e8da2ff7bdf3d3aff415fd827dc73873c2c   10907:
 9e953f756660959840603c15e217cfd5732dbf1d   10903:
 e358588479cb65d6136d40feae8e3fbe54e41a08   10895:
 ec52b6a231348b8d111d2b0b38d4e152d21c0ea3   10879:
 4cb1ebce28333dcf627abc49003b4a36071ba54f v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/usb/misc/idmouse.c | 16 ++--------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 6bcc95338063..e7ed32e0d593 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32b32c2c3566b206988fa30336ec6534759823b5
+refs/heads/master: 018a2cdf1e633497bb4f01eb86a7cbffa611776d
diff --git a/trunk/drivers/usb/misc/idmouse.c b/trunk/drivers/usb/misc/idmouse.c
index 3944a55ed74c..1dc3e0f73014 100644
--- a/trunk/drivers/usb/misc/idmouse.c
+++ b/trunk/drivers/usb/misc/idmouse.c
@@ -319,20 +319,8 @@ static ssize_t idmouse_read(struct file *file, char __user *buffer, size_t count
 		return -ENODEV;
 	}
 
-	if (*ppos >= IMGSIZE) {
-		up (&dev->sem);
-		return 0;
-	}
-
-	count = min ((loff_t)count, IMGSIZE - (*ppos));
-
-	if (copy_to_user (buffer, dev->bulk_in_buffer + *ppos, count)) {
-		result = -EFAULT;
-	} else {
-		result = count;
-		*ppos += count;
-	}
-
+	result = simple_read_from_buffer(buffer, count, ppos,
+					dev->bulk_in_buffer, IMGSIZE);
 	/* unlock the device */
 	up(&dev->sem);
 	return result;