Re: [PATCH 2/2] tc1100-wmi - Fail gracefully if ACPI is disabled

[Len Brown]

never mind -- linus fixed this in a more elegant way.

-len

On Thursday 14 February 2008 01:11, Len Brown wrote:
> applied.
> 
> thanks,
> -len
> 
> On Monday 11 February 2008 14:55, Carlos Corbacho wrote:
> > tc1100-wmi - Fail gracefully if ACPI is disabled
> > 
> > From: Carlos Corbacho <carlos@xxxxxxxxxxxxxxxxxxx>
> > 
> > WMI drivers, like their ACPI counterparts, should also check if ACPI is
> > disabled or not, and bail out if so, otherwise we cause a crash.
> > 
> > Spotted by Ingo Molnar.
> > 
> > Signed-off-by: Carlos Corbacho <carlos@xxxxxxxxxxxxxxxxxxx>
> > CC: Ingo Molnar <mingo@xxxxxxx>
> > CC: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
> > CC: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> > CC: Len Brown <lenb@xxxxxxxxxx>
> > ---
> > 
> >  drivers/misc/tc1100-wmi.c |    3 +++
> >  1 files changed, 3 insertions(+), 0 deletions(-)
> > 
> > 
> > diff --git a/drivers/misc/tc1100-wmi.c b/drivers/misc/tc1100-wmi.c
> > index f25e4c9..cb8f79f 100644
> > --- a/drivers/misc/tc1100-wmi.c
> > +++ b/drivers/misc/tc1100-wmi.c
> > @@ -263,6 +263,9 @@ static int __init tc1100_init(void)
> >  {
> >  	int result = 0;
> >  
> > +	if (acpi_disabled)
> > +		return -ENODEV;
> > +
> >  	if (!wmi_has_guid(GUID))
> >  		return -ENODEV;
> >  
> > 
> 
--
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/