Merge branches 'master' and 'devel' into for-linus

[mv-sheeva.git] / drivers / input / serio / i8042-jazzio.h

diff --git a/drivers/input/serio/i8042-jazzio.h b/drivers/input/serio/i8042-jazzio.h
index 5c20ab131488e038228f642e5c7e0705834257e9..13fd7108eb2836ad5eb7625fab88c1d2dbf425de 100644 (file)
--- a/drivers/input/serio/i8042-jazzio.h
+++ b/drivers/input/serio/i8042-jazzio.h
@@ -53,7 +53,7 @@ static inline int i8042_platform_init(void)
 #if 0
        /* XXX JAZZ_KEYBOARD_ADDRESS is a virtual address */
        if (!request_mem_region(JAZZ_KEYBOARD_ADDRESS, 2, "i8042"))
-               return 1;
+               return -EBUSY;
 #endif
 
        return 0;