Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753238AbbDTFyG (ORCPT ); Mon, 20 Apr 2015 01:54:06 -0400 Received: from smtp1.cypress.com ([157.95.67.100]:51530 "EHLO smtp1.cypress.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751297AbbDTFyE (ORCPT ); Mon, 20 Apr 2015 01:54:04 -0400 X-Greylist: delayed 607 seconds by postgrey-1.27 at vger.kernel.org; Mon, 20 Apr 2015 01:54:03 EDT From: Dudley Du To: dmitry.torokhov@gmail.com Cc: Dudley Du , bleung@google.com, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] input: cyapa: fix update suspend scanrate set to max 1000 issue Date: Mon, 20 Apr 2015 13:43:14 +0800 Message-Id: <1429508594-24255-1-git-send-email-dudl@cypress.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1498 Lines: 39 Fix update suspend scareate always set to max 1000 issue, the root cause is the missed using max_t as min_t. TEST=test on Chromebook. Signed-off-by: Dudley Du --- drivers/input/mouse/cyapa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/input/mouse/cyapa.c b/drivers/input/mouse/cyapa.c index 58f4f6f..efe1484 100644 --- a/drivers/input/mouse/cyapa.c +++ b/drivers/input/mouse/cyapa.c @@ -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); -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/