From ba7fff48bf95b2cb1bf6f3c7cf0647eb18ca483a Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Thu, 29 Jan 2009 22:56:08 -0800 Subject: [PATCH] --- yaml --- r: 131927 b: refs/heads/master c: e8e0c02340f2d3e4f1ea75a136883d8797290929 h: refs/heads/master i: 131925: 8b3540b5276c8efab46606e23e43a1d0bab62cad 131923: 4c38644a9ed0e34fb55f614147f487b3b45e71a6 131919: 264120e14ca428c5b75e04f3dccf8b8a16efa427 v: v3 --- [refs] | 2 +- trunk/drivers/input/keyboard/bf54x-keys.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c38d12e36359..dbda42ed5a15 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 27f23336bcc1b08512751c878b3e05ed6b815e86 +refs/heads/master: e8e0c02340f2d3e4f1ea75a136883d8797290929 diff --git a/trunk/drivers/input/keyboard/bf54x-keys.c b/trunk/drivers/input/keyboard/bf54x-keys.c index 19284016e0f4..ee855c5202e8 100644 --- a/trunk/drivers/input/keyboard/bf54x-keys.c +++ b/trunk/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 */