From: Chris Wright Date: Tue, 27 Jun 2006 19:07:24 +0000 (-0700) Subject: input modalias fix fwd from Dmitry X-Git-Tag: v2.6.17.2~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=10d3eb9c096badc1f43366c936b3a5e18a058d9f;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..300e8b2b7be --- /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 +To: stable@kernel.org +Cc: Richard Purdie +Subject: Input: return correct size when reading modalias attribute + +From: Richard Purdie + +Input: return correct size when reading modalias attribute + +Signed-off-by: Richard Purdie +Signed-off-by: Dmitry Torokhov +Signed-off-by: Chris Wright +--- + + 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 8690016a974..5102cfc7acd 100644 --- 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