input modalias fix fwd from Dmitry

diff --git a/queue-2.6.17/input-return-correct-size-when-reading-modalias-attribute.patch b/queue-2.6.17/input-return-correct-size-when-reading-modalias-attribute.patch
new file mode 100644 (file)
index 0000000..300e8b2
--- /dev/null
+++ b/queue-2.6.17/input-return-correct-size-when-reading-modalias-attribute.patch
@@ -0,0 +1,30 @@
+From stable-bounces@linux.kernel.org  Mon Jun 26 22:26:09 2006
+Date: Tue, 27 Jun 2006 01:25:35 -0400
+From: Dmitry Torokhov <dtor_core@ameritech.net>
+To: stable@kernel.org
+Cc: Richard Purdie <rpurdie@rpsys.net>
+Subject: Input: return correct size when reading modalias attribute
+
+From: Richard Purdie <rpurdie@rpsys.net>
+
+Input: return correct size when reading modalias attribute
+
+Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
+Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+
+ drivers/input/input.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- linux-2.6.17.1.orig/drivers/input/input.c
++++ linux-2.6.17.1/drivers/input/input.c
+@@ -629,7 +629,7 @@ static ssize_t input_dev_show_modalias(s
+ 
+       len = input_print_modalias(buf, PAGE_SIZE, id, 1);
+ 
+-      return max_t(int, len, PAGE_SIZE);
++      return min_t(int, len, PAGE_SIZE);
+ }
+ static CLASS_DEVICE_ATTR(modalias, S_IRUGO, input_dev_show_modalias, NULL);
+ 

diff --git a/queue-2.6.17/series b/queue-2.6.17/series
index 8690016a9741adfb76dab114b4e0824ae883d52a..5102cfc7acde7c5a1c48544058041804a589a5ba 100644 (file)
--- a/queue-2.6.17/series
+++ b/queue-2.6.17/series
@@ -21,3 +21,4 @@ ide-io-increase-timeout-value-to-allow-for-slave-wakeup.patch
 kbuild-fix-100-initramfs-bloat-in-2.6.17-versus-2.6.16.patch
 link-error-when-futexes-are-disabled-on-64bit-architectures.patch
 idr-fix-race-in-idr-code.patch
+input-return-correct-size-when-reading-modalias-attribute.patch