only set hw_debounce_time when hw_debounce is active

[ms2-fixes] / debounce.c

diff --git a/debounce.c b/debounce.c
index be78a44777d86a7a1b1900a06823755a6cdb6feb..45b01403fb1d31daef858cfa088578b808fc1ec9 100644 (file)
--- a/debounce.c
+++ b/debounce.c
@@ -38,7 +38,7 @@ static void hw_debounce_set(int enable, int time) {
                        omap_set_gpio_debounce(gpio, enable);
                }
 
-               if (time != -1) {
+               if ((time != -1) && hw_debounce) {
                        printk(KERN_INFO PREFIX "Setting hardware debounce time for GPIO %d to %d (%dus)\n", gpio, time, (time+1)*31);
                        omap_set_gpio_debounce_time(gpio, time);
                }