From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 26 Jun 2006 05:48:21 +0000 (-0400)
Subject: Input: return correct size when reading modalias attribute
X-Git-Tag: v2.6.18-rc1~604^2~8
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8a3cf456adbde8317a15fc038cfe82c630512f2e;p=linux-2.6-omap-h63xx.git

Input: return correct size when reading modalias attribute

Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---

diff --git a/drivers/input/input.c b/drivers/input/input.c
index 3038c268917..b149c943484 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);