From e8930480255bbb25e647180309d9d0779dd30650 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 26 Jun 2006 01:48:21 -0400
Subject: [PATCH] --- yaml --- r: 30557 b: refs/heads/master c:
 8a3cf456adbde8317a15fc038cfe82c630512f2e h: refs/heads/master i:   30555:
 9a5ddf503ab4c6902b5a73510f1bedf355c2de08 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/input/input.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a14338068573..eaa39519dcbb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62f7caf9273e3596aab1ec399b5c1e02cfb390da
+refs/heads/master: 8a3cf456adbde8317a15fc038cfe82c630512f2e
diff --git a/trunk/drivers/input/input.c b/trunk/drivers/input/input.c
index 3038c268917d..b149c9434849 100644
--- a/trunk/drivers/input/input.c
+++ b/trunk/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);