From patchwork Sat Jan 17 00:55:01 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frans Pop X-Patchwork-Id: 2909 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n0H0opbX029801 for ; Fri, 16 Jan 2009 16:50:52 -0800 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753237AbZAQAzH (ORCPT ); Fri, 16 Jan 2009 19:55:07 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754639AbZAQAzG (ORCPT ); Fri, 16 Jan 2009 19:55:06 -0500 Received: from hpsmtp-eml16.KPNXCHANGE.COM ([213.75.38.116]:2726 "EHLO hpsmtp-eml16.kpnxchange.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751549AbZAQAzF (ORCPT ); Fri, 16 Jan 2009 19:55:05 -0500 Received: from cpsmtp-eml101.kpnxchange.com ([213.75.84.101]) by hpsmtp-eml16.kpnxchange.com with Microsoft SMTPSVC(6.0.3790.3959); Sat, 17 Jan 2009 01:55:03 +0100 Received: from aragorn.fjphome.nl ([84.85.147.182]) by cpsmtp-eml101.kpnxchange.com with Microsoft SMTPSVC(6.0.3790.3959); Sat, 17 Jan 2009 01:55:03 +0100 From: Frans Pop To: Linux Kernel Mailing List Subject: [PATCH] hp-wmi: fix regressions caused by missing if statement Date: Sat, 17 Jan 2009 01:55:01 +0100 User-Agent: KMail/1.9.9 Cc: Larry Finger , Matthew Garrett , linux-acpi@vger.kernel.org, Andrew Morton References: <200901170013.55786.elendil@planet.nl> <200901170131.22541.elendil@planet.nl> In-Reply-To: <200901170131.22541.elendil@planet.nl> MIME-Version: 1.0 Content-Disposition: inline Message-Id: <200901170155.02757.elendil@planet.nl> X-OriginalArrivalTime: 17 Jan 2009 00:55:03.0580 (UTC) FILETIME=[3B598DC0:01C9783E] Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org From: Frans Pop hp-wmi: fix regressions caused by missing if statement Error was introduced in commit fe8e4e039dc3. Signed-off-by: Frans Pop Acked-by: Larry Finger Signed-off-by: Matthew Garrett --- > On Saturday 17 January 2009, Frans Pop wrote: > > When I first booted .29-rc2 my HP 2510p notebook hung while loading > > hp-wmi, which I have listed in /etc/modules. Hard poweroff was > > needed. And this obvious patch fixes the regression (tested). Andrew: I've added you as the broken patch also went via you. -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c index 7c789f0..6260420 100644 --- a/drivers/platform/x86/hp-wmi.c +++ b/drivers/platform/x86/hp-wmi.c @@ -441,6 +441,7 @@ static int __init hp_wmi_bios_setup(struct platform_device *device) bluetooth_rfkill->toggle_radio = hp_wmi_bluetooth_set; bluetooth_rfkill->user_claim_unsupported = 1; err = rfkill_register(bluetooth_rfkill); + if (err) goto register_bluetooth_error; }