On Thu, Jan 29, 2009 at 09:08:45AM -0000, Hennerich, Michael wrote: > > > >From: Roel Kluin [mailto:roel.kluin@xxxxxxxxx] > > > >! has a higher priority than > > > > >Signed-off-by: Roel Kluin <roel.kluin@xxxxxxxxx> > >--- > >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 */ > > Acked-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx> > Applied to 'for-linus', thanks! -- Dmitry -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
