Input: Add a missing KERN_INFO message designation, fix behavior

       when only a keyboard part of the controller is detected.

Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index f64867808fea9ddde56c298e67fac8771b53f69c..0327472393ded3dff85f2935328206f21e63ff50 100644 (file)
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -227,7 +227,7 @@ static int i8042_pnp_init(void)
        int result_kbd, result_aux;
 
        if (i8042_nopnp) {
-               printk("i8042: PNP detection disabled\n");
+               printk(KERN_INFO "i8042: PNP detection disabled\n");
                return 0;
        }
 
@@ -265,7 +265,7 @@ static int i8042_pnp_init(void)
                i8042_pnp_kbd_irq = i8042_kbd_irq;
        }
 
-       if (result_aux > 0 && !i8042_pnp_aux_irq) {
+       if (!i8042_pnp_aux_irq) {
                printk(KERN_WARNING "PNP: PS/2 controller doesn't have AUX irq; using default %#x\n", i8042_aux_irq);
                i8042_pnp_aux_irq = i8042_aux_irq;
        }