Input: cyapa - fix setting suspend scan rate
authorDudley Du <dudl@cypress.com>
Mon, 20 Apr 2015 17:00:05 +0000 (10:00 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 20 Apr 2015 17:30:09 +0000 (10:30 -0700)
The suspend scan rate value should not exceed 1000, unfortunately when
implementing the limit we used max_t instead of min_t, causing the value to
be at least 1000.

Signed-off-by: Dudley Du <dudl@cypress.com>
Reviewed-by: Benson Leung <bleung@chromium.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/mouse/cyapa.c

index 58f4f6fa4857c34eb6a831154f039e063653992a..efe148474e7f6b4dcf758ac628bf2f081a18d6c4 100644 (file)
@@ -723,7 +723,7 @@ static ssize_t cyapa_update_suspend_scanrate(struct device *dev,
        } else if (sysfs_streq(buf, OFF_MODE_NAME)) {
                cyapa->suspend_power_mode = PWR_MODE_OFF;
        } else if (!kstrtou16(buf, 10, &sleep_time)) {
-               cyapa->suspend_sleep_time = max_t(u16, sleep_time, 1000);
+               cyapa->suspend_sleep_time = min_t(u16, sleep_time, 1000);
                cyapa->suspend_power_mode =
                        cyapa_sleep_time_to_pwr_cmd(cyapa->suspend_sleep_time);
        } else {
@@ -840,7 +840,7 @@ static ssize_t cyapa_update_rt_suspend_scanrate(struct device *dev,
        if (error)
                return error;
 
-       cyapa->runtime_suspend_sleep_time = max_t(u16, time, 1000);
+       cyapa->runtime_suspend_sleep_time = min_t(u16, time, 1000);
        cyapa->runtime_suspend_power_mode =
                cyapa_sleep_time_to_pwr_cmd(cyapa->runtime_suspend_sleep_time);