From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bryan Wu Subject: [PATCH] Input: bf54x-keys: ! has a higher priority than > Date: Thu, 5 Feb 2009 15:19:55 +0800 Message-ID: <1233818395-6461-1-git-send-email-cooloney@kernel.org> Return-path: Received: from nwd2mail10.analog.com ([137.71.25.55]:14751 "EHLO nwd2mail10.analog.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752375AbZBEHSG (ORCPT ); Thu, 5 Feb 2009 02:18:06 -0500 Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: dmitry.torokhov@gmail.com Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Roel Kluin , Michael Hennerich , Bryan Wu From: Roel Kluin Signed-off-by: Roel Kluin Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu --- drivers/input/keyboard/bf54x-keys.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/input/keyboard/bf54x-keys.c b/drivers/input/keyboard/bf54x-keys.c index 1928401..ee855c5 100644 --- a/drivers/input/keyboard/bf54x-keys.c +++ b/drivers/input/keyboard/bf54x-keys.c @@ -209,8 +209,8 @@ static int __devinit bfin_kpad_probe(struct platform_device *pdev) goto out; } - if (!pdata->debounce_time || !pdata->debounce_time > MAX_MULT || - !pdata->coldrive_time || !pdata->coldrive_time > MAX_MULT) { + if (!pdata->debounce_time || pdata->debounce_time > MAX_MULT || + !pdata->coldrive_time || pdata->coldrive_time > MAX_MULT) { printk(KERN_ERR DRV_NAME ": Invalid Debounce/Columdrive Time from pdata\n"); bfin_write_KPAD_MSEL(0xFF0); /* Default MSEL */ -- 1.5.6.3