From patchwork Tue Nov 2 13:41:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Renninger X-Patchwork-Id: 297332 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oA2DfCpO011639 for ; Tue, 2 Nov 2010 13:41:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752767Ab0KBNlM (ORCPT ); Tue, 2 Nov 2010 09:41:12 -0400 Received: from cantor2.suse.de ([195.135.220.15]:47628 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752766Ab0KBNlL (ORCPT ); Tue, 2 Nov 2010 09:41:11 -0400 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2]) by mx2.suse.de (Postfix) with ESMTP id 5ACD28980B; Tue, 2 Nov 2010 14:41:10 +0100 (CET) From: Thomas Renninger Organization: SUSE Products GmbH To: Len Brown Subject: [PATCH] intel_idle: Do not load if user overrides idle function via idle= boot param Date: Tue, 2 Nov 2010 14:41:08 +0100 User-Agent: KMail/1.13.3 (Linux/2.6.31.5-0.1-desktop; KDE/4.4.3; x86_64; ; ) Cc: linux-acpi@vger.kernel.org, linux-pm@lists.linux-foundation.org, stable@kernel.org MIME-Version: 1.0 Message-Id: <201011021441.09258.trenn@suse.de> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 02 Nov 2010 13:41:13 +0000 (UTC) diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c index 41665d2..e50389b 100644 --- a/drivers/idle/intel_idle.c +++ b/drivers/idle/intel_idle.c @@ -410,6 +410,9 @@ static int __init intel_idle_init(void) { int retval; + if (boot_option_idle_override) + return -ENODEV; + retval = intel_idle_probe(); if (retval) return retval;