Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756972AbYBNGM0 (ORCPT ); Thu, 14 Feb 2008 01:12:26 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750941AbYBNGMP (ORCPT ); Thu, 14 Feb 2008 01:12:15 -0500 Received: from hera.kernel.org ([140.211.167.34]:46683 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750711AbYBNGMN (ORCPT ); Thu, 14 Feb 2008 01:12:13 -0500 From: Len Brown Organization: Intel Open Source Technology Center To: Carlos Corbacho Subject: Re: [PATCH 2/2] tc1100-wmi - Fail gracefully if ACPI is disabled Date: Thu, 14 Feb 2008 01:11:41 -0500 User-Agent: KMail/1.9.5 Cc: Ingo Molnar , Linus Torvalds , Andrew Morton , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@lists.linux-foundation.org References: <200802080145.16774.lenb@kernel.org> <200802111923.31736.carlos@strangeworlds.co.uk> <200802111955.46199.carlos@strangeworlds.co.uk> In-Reply-To: <200802111955.46199.carlos@strangeworlds.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200802140111.41883.lenb@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1308 Lines: 46 applied. thanks, -len On Monday 11 February 2008 14:55, Carlos Corbacho wrote: > tc1100-wmi - Fail gracefully if ACPI is disabled > > From: Carlos Corbacho > > 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 > CC: Ingo Molnar > CC: Linus Torvalds > CC: Andrew Morton > CC: Len Brown > --- > > 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/