From b27c2e0aa34c3469260e8367b4d052a7cc253acb Mon Sep 17 00:00:00 2001
From: Sergey Vlasov <vsu@altlinux.ru>
Date: Thu, 9 Nov 2006 00:34:27 -0500
Subject: [PATCH] --- yaml --- r: 40703 b: refs/heads/master c:
 eb5d5829b368c5e32f248a70797bee5a414a2ef0 h: refs/heads/master i:   40701:
 805df0f50a668a6431cb6a51a5d2f723ecccd4f2   40699:
 0131d28dd22416a2d18dabc29f45870abe0b3ca2   40695:
 ef8b65fb496fb563bab7e804990123feb3cae6c4   40687:
 02e350f4544e804142ce0b27b1e805106d7d3094   40671:
 c4badc0e7acaced25b254c05d2d9f228fdb9060d   40639:
 904cf7530c10bb1f43ef7166084e5d6c6e711fd2   40575:
 18aa6bdc34012cfaa44676a75df527fb4dafd6c6   40447:
 88bcbb1b3c3732b8dc6577f5697ba9cb320eb2b7 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/input/mouse/psmouse-base.c | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 3f5323bd4f3a..354bcfbd1f15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 721556150e397f606a3f029736d77a27503f94e2
+refs/heads/master: eb5d5829b368c5e32f248a70797bee5a414a2ef0
diff --git a/trunk/drivers/input/mouse/psmouse-base.c b/trunk/drivers/input/mouse/psmouse-base.c
index 9144df65e703..58beca99a9c3 100644
--- a/trunk/drivers/input/mouse/psmouse-base.c
+++ b/trunk/drivers/input/mouse/psmouse-base.c
@@ -1349,14 +1349,14 @@ ssize_t psmouse_attr_set_helper(struct device *dev, struct device_attribute *dev
 
 static ssize_t psmouse_show_int_attr(struct psmouse *psmouse, void *offset, char *buf)
 {
-	unsigned long *field = (unsigned long *)((char *)psmouse + (size_t)offset);
+	unsigned int *field = (unsigned int *)((char *)psmouse + (size_t)offset);
 
-	return sprintf(buf, "%lu\n", *field);
+	return sprintf(buf, "%u\n", *field);
 }
 
 static ssize_t psmouse_set_int_attr(struct psmouse *psmouse, void *offset, const char *buf, size_t count)
 {
-	unsigned long *field = (unsigned long *)((char *)psmouse + (size_t)offset);
+	unsigned int *field = (unsigned int *)((char *)psmouse + (size_t)offset);
 	unsigned long value;
 	char *rest;
 
@@ -1364,6 +1364,9 @@ static ssize_t psmouse_set_int_attr(struct psmouse *psmouse, void *offset, const
 	if (*rest)
 		return -EINVAL;
 
+	if ((unsigned int)value != value)
+		return -EINVAL;
+
 	*field = value;
 
 	return count;