summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoel Kluin <roel.kluin@gmail.com>2009-01-29 22:56:08 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-01-29 23:00:35 -0800
commite8e0c02340f2d3e4f1ea75a136883d8797290929 (patch)
tree3e7b94185eebc752c11e0327098196047497cd4b
parent27f23336bcc1b08512751c878b3e05ed6b815e86 (diff)
downloadtalos-op-linux-e8e0c02340f2d3e4f1ea75a136883d8797290929.tar.gz
talos-op-linux-e8e0c02340f2d3e4f1ea75a136883d8797290929.zip
Input: bf54x-keys - fix debounce time validation
Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Acked-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
-rw-r--r--drivers/input/keyboard/bf54x-keys.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/keyboard/bf54x-keys.c b/drivers/input/keyboard/bf54x-keys.c
index 19284016e0f4..ee855c5202e8 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 */
OpenPOWER on IntegriCloud