From patchwork Tue Nov 17 22:27:29 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 60799 X-Patchwork-Delegate: mjg59@srcf.ucam.org 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 nAHMSi3O026855 for ; Tue, 17 Nov 2009 22:28:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755527AbZKQW2h (ORCPT ); Tue, 17 Nov 2009 17:28:37 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756291AbZKQW2h (ORCPT ); Tue, 17 Nov 2009 17:28:37 -0500 Received: from smtp1.linux-foundation.org ([140.211.169.13]:42338 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755527AbZKQW2h (ORCPT ); Tue, 17 Nov 2009 17:28:37 -0500 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 nAHMRUsq015088 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 17 Nov 2009 14:27:31 -0800 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 nAHMRUfe023122; Tue, 17 Nov 2009 14:27:30 -0800 Message-Id: <200911172227.nAHMRUfe023122@imap1.linux-foundation.org> Subject: [patch 03/12] dell_laptop: when the "hardware" switch is disabled, don't actually allow changing the softblock status. To: lenb@kernel.org Cc: linux-acpi@vger.kernel.org, akpm@linux-foundation.org, Mario_Limonciello@Dell.com From: akpm@linux-foundation.org Date: Tue, 17 Nov 2009 14:27:29 -0800 MIME-Version: 1.0 X-Spam-Status: No, hits=-3.518 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 diff -puN drivers/platform/x86/dell-laptop.c~dell_laptop-when-the-hardware-switch-is-disabled-dont-actually-allow-changing-the-softblock-status drivers/platform/x86/dell-laptop.c --- a/drivers/platform/x86/dell-laptop.c~dell_laptop-when-the-hardware-switch-is-disabled-dont-actually-allow-changing-the-softblock-status +++ a/drivers/platform/x86/dell-laptop.c @@ -181,6 +181,10 @@ static int dell_rfkill_set(void *data, b unsigned long radio = (unsigned long)data; memset(&buffer, 0, sizeof(struct calling_interface_buffer)); + dell_send_request(&buffer, 17, 11); + if (!(buffer.output[1] & BIT(16))) + return -EINVAL; + buffer.input[0] = (1 | (radio<<8) | (disable << 16)); dell_send_request(&buffer, 17, 11);