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

[Felipe Contreras]

On Wed, May 12, 2010 at 3:11 AM, Bastien Nocera <hadess@xxxxxxxxxx> 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
>
> Signed-off-by: Bastien Nocera <hadess@xxxxxxxxxx>
> ---
> Âdrivers/input/serio/i8042-x86ia64io.h | Â 18 ++++++++++++++++++
> Â1 files changed, 18 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
> index ead0494..e859902 100644
> --- a/drivers/input/serio/i8042-x86ia64io.h
> +++ b/drivers/input/serio/i8042-x86ia64io.h
> @@ -479,6 +479,22 @@ static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = {
> Â Â Â Â{ }
> Â};
>
> +/* Intel Apple Macs never have an i8042 controller,
> + * so we shouldn't even try to probe for it */
> +static const struct dmi_system_id __initconst i8042_dmi_no_probe_table[] = {
> + Â Â Â {
> + Â Â Â Â Â Â Â .matches = {
> + Â Â Â Â Â Â Â Â Â Â Â DMI_MATCH(DMI_BIOS_VENDOR, "Apple Computer, Inc.")
> + Â Â Â Â Â Â Â },
> + Â Â Â },
> + Â Â Â {
> + Â Â Â Â Â Â Â .matches = {
> + Â Â Â Â Â Â Â Â Â Â Â DMI_MATCH(DMI_BIOS_VENDOR, "Apple Inc.")
> + Â Â Â Â Â Â Â },
> + Â Â Â },
> + Â Â Â {}

No need for that extra {}

-- 
Felipe Contreras
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/