From: Richard Purdie <rpurdie@rpsys.net>
Date: Tue, 27 Jun 2006 05:25:35 +0000 (-0400)
Subject: [PATCH] Input: return correct size when reading modalias attribute
X-Git-Tag: v2.6.17.2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=988bc3337ebc15c7c6078d3263b0599bc744d693;p=thirdparty%2Fkernel%2Fstable.git

[PATCH] Input: return correct size when reading modalias attribute

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>
---

diff --git a/drivers/input/input.c b/drivers/input/input.c
index 3038c268917d7..b149c94348499 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -629,7 +629,7 @@ static ssize_t input_dev_show_modalias(struct class_device *dev, char *buf)
 
 	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);