Input, blackfin: ! has a higher priority than >

PATCH Applied Roel Kluin 3 participants 3 messages Jan 28, 2009 – Jan 30, 2009

Subsystems (2)

HID Input drivers

lore

Share & tools

lore

Roel Kluin

author

2009-01-28 22:22 UTC #0 lore raw

PATCH 1/1 Input, blackfin: ! has a higher priority than >

! has a higher priority than >

Signed-off-by Roel Kluin <[email protected]>

---

drivers/input/keyboard/bf54x-keys.c +2 -2

index 1928401..ee855c5 100644
@@ -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	*/

Hennerich, Michael

Acked-by on v1 1/1

2009-01-29 09:18 UTC #1 lore raw

Quoted 14 lines

From: Roel Kluin [mailto:[email protected]]
! has a higher priority than >
Signed-off-by Roel Kluin <[email protected]>
---
drivers/input/keyboard/bf54x-keys.c +0 -0
index 1928401..ee855c5 100644

drivers/input/keyboard/bf54x-keys.c static int __devinit bfin_kpad_probe(struct · line 216

Quoted 10 lines

drivers/input/keyboard/bf54x-keys.c +2 -2

@@ -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");

Quoted 1 line

		bfin_write_KPAD_MSEL(0xFF0);	/* Default MSEL	*/

Acked-by Michael Hennerich <[email protected]>

Thanks,
Michael

Dmitry Torokhov

maintainer Applied

2009-01-30 07:10 UTC #2 lore raw

Quoted 25 lines · Michael

Quoted 14 lines
From: Roel Kluin [mailto:[email protected]]
! has a higher priority than >
Signed-off-by Roel Kluin <[email protected]>
---
drivers/input/keyboard/bf54x-keys.c +0 -0
index 1928401..ee855c5 100644
drivers/input/keyboard/bf54x-keys.c static int __devinit bfin_kpad_probe(struct · line 216
Quoted 10 lines
drivers/input/keyboard/bf54x-keys.c +2 -2
@@ -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");

Quoted 4 lines

Quoted 1 line
		bfin_write_KPAD_MSEL(0xFF0);	/* Default MSEL	*/
Acked-by Michael Hennerich <[email protected]>

Applied to 'for-linus', thanks!

Signature · 1 line

Dmitry