From patchwork Thu Aug 6 22:57:51 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 39708 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 n76MxLom000974 for ; Thu, 6 Aug 2009 23:00:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755951AbZHFXAD (ORCPT ); Thu, 6 Aug 2009 19:00:03 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756522AbZHFXAD (ORCPT ); Thu, 6 Aug 2009 19:00:03 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:34100 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755951AbZHFXAC (ORCPT ); Thu, 6 Aug 2009 19:00:02 -0400 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id n76MvqB1015702 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 6 Aug 2009 15:57:53 -0700 Received: from localhost.localdomain (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id n76MvpoF024228; Thu, 6 Aug 2009 15:57:51 -0700 Message-Id: <200908062257.n76MvpoF024228@imap1.linux-foundation.org> Subject: [patch 4/9] toshiba_acpi: return on a fail path To: lenb@kernel.org Cc: linux-acpi@vger.kernel.org, akpm@linux-foundation.org, jirislaby@gmail.com, hmh@hmh.eng.br, johannes@sipsolutions.net, len.brown@intel.com, linville@tuxdriver.com From: akpm@linux-foundation.org Date: Thu, 06 Aug 2009 15:57:51 -0700 X-Spam-Status: No, hits=-3.511 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org From: Jiri Slaby Return from bt_rfkill_poll() when hci_get_radio_state() fails. value is invalid in that case and should not be assigned to the rfkill state. This also fixes a double unlock bug. Signed-off-by: Jiri Slaby Cc: John W. Linville Cc: Johannes Berg Cc: Len Brown Cc: Henrique de Moraes Holschuh Signed-off-by: Andrew Morton --- drivers/platform/x86/toshiba_acpi.c | 1 + 1 file changed, 1 insertion(+) diff -puN drivers/platform/x86/toshiba_acpi.c~toshiba_acpi-return-on-a-fail-path drivers/platform/x86/toshiba_acpi.c --- a/drivers/platform/x86/toshiba_acpi.c~toshiba_acpi-return-on-a-fail-path +++ a/drivers/platform/x86/toshiba_acpi.c @@ -335,6 +335,7 @@ static void bt_rfkill_poll(struct rfkill if (hci_result != HCI_SUCCESS) { /* Can't do anything useful */ mutex_unlock(&dev->mutex); + return; } new_rfk_state = value;