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

[Dmitry Torokhov <dmitry.torokhov@gmail.com>]

On Wed, May 12, 2010 at 01:51:13PM +0300, Felipe Contreras wrote:
> On Wed, May 12, 2010 at 3:11 AM, 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
> >
> > Signed-off-by: Bastien Nocera <hadess@hadess.net>
> > ---
> >  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 {}
> 

Actually, there is.

-- 
Dmitry