summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2006-06-26 01:48:21 -0400
committerDmitry Torokhov <dtor_core@ameritech.net>2006-06-26 01:48:21 -0400
commit8a3cf456adbde8317a15fc038cfe82c630512f2e (patch)
tree376ba671845f8c12c646b9b25979a792916f3f4e /drivers
parent62f7caf9273e3596aab1ec399b5c1e02cfb390da (diff)
downloadlinux-8a3cf456adbde8317a15fc038cfe82c630512f2e.tar.gz
linux-8a3cf456adbde8317a15fc038cfe82c630512f2e.tar.bz2
linux-8a3cf456adbde8317a15fc038cfe82c630512f2e.zip
Input: return correct size when reading modalias attribute
Signed-off-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/input/input.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 3038c268917d..b149c9434849 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);