Re: [PATCH] Disable i8042 checks on Intel Apple Macs

[Pekka Enberg <penberg@cs.helsinki.fi>]

On Tue, May 4, 2010 at 8:36 PM, Bastien Nocera <hadess@hadess.net> wrote:
> As those computers never had any i8042 controllers, and the
> current lookup code could potentially lock up/hang/wait for
> timeout for long periods of time.
>
> Fixes intermittent hangs on boot on a MacbookAir1,1

My Macbook also complains (doesn't hang though) about this:

Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>

> Signed-off-by: Bastien Nocera <hadess@hadess.net>
> ---
>  drivers/input/serio/i8042.c |   18 ++++++++++++++++++
>  1 files changed, 18 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
> index d84a36e..2be7207 100644
> --- a/drivers/input/serio/i8042.c
> +++ b/drivers/input/serio/i8042.c
> @@ -1438,12 +1438,30 @@ static struct platform_driver i8042_driver = {
>        .shutdown       = i8042_shutdown,
>  };
>
> +static struct dmi_system_id __initdata dmi_system_table[] = {
> +       {
> +               .matches = {
> +                       DMI_MATCH(DMI_BIOS_VENDOR, "Apple Computer, Inc.")
> +               },
> +       },
> +       {
> +               .matches = {
> +                       DMI_MATCH(DMI_BIOS_VENDOR, "Apple Inc.")
> +               },
> +       },
> +       {}
> +};
> +
>  static int __init i8042_init(void)
>  {
>        int err;
>
>        dbg_init();
>
> +       /* Intel Apple Macs never have an i8042 controller */
> +       if (dmi_check_system(dmi_system_table) > 0)
> +               return -ENODEV;
> +
>        err = i8042_platform_init();
>        if (err)
>                return err;
> --
> 1.6.6
>
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>