From patchwork Wed Mar 16 08:59:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joey Lee X-Patchwork-Id: 638971 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 p2G8xLSr023173 for ; Wed, 16 Mar 2011 08:59:21 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752039Ab1CPI7U (ORCPT ); Wed, 16 Mar 2011 04:59:20 -0400 Received: from novprvlin0050.provo.novell.com ([137.65.248.33]:47131 "EHLO novprvlin0050.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751873Ab1CPI7T (ORCPT ); Wed, 16 Mar 2011 04:59:19 -0400 Received: from INET-PRV1-MTA by novprvlin0050.provo.novell.com with Novell_GroupWise; Wed, 16 Mar 2011 02:59:18 -0600 Message-Id: <4D8116940200002300029EB1@novprvlin0050.provo.novell.com> X-Mailer: Novell GroupWise Internet Agent 8.0.2 Date: Wed, 16 Mar 2011 02:59:16 -0600 From: "Joey Lee" To: Cc: "Al Cho" , , , , Subject: Re: acer-wmi: rfkill and bluetooth enabling doesn't work as in 2.6.37 References: <4D79E5230200002300029ADA@novprvlin0050.provo.novell.com> <4D7B32B10200002300029B5E@novprvlin0050.provo.novell.com> <4D7FE4260200002300029D70@novprvlin0050.provo.novell.com> <201103160732.15488.oldium.pro@seznam.cz> In-Reply-To: <201103160732.15488.oldium.pro@seznam.cz> Mime-Version: 1.0 Content-Disposition: inline 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.6 (demeter1.kernel.org [140.211.167.41]); Wed, 16 Mar 2011 08:59:22 +0000 (UTC) diff --git a/net/rfkill/core.c b/net/rfkill/core.c index 0198191..0dec078 100644 --- a/net/rfkill/core.c +++ b/net/rfkill/core.c @@ -950,14 +950,14 @@ int __must_check rfkill_register(struct rfkill *rfkill) if (!rfkill->persistent || rfkill_epo_lock_active) { schedule_work(&rfkill->sync_work); - } else { -#ifdef CONFIG_RFKILL_INPUT - bool soft_blocked = !!(rfkill->state & RFKILL_BLOCK_SW); - - if (!atomic_read(&rfkill_input_disabled)) - __rfkill_switch_all(rfkill->type, soft_blocked); -#endif - } + } //else { +//#ifdef CONFIG_RFKILL_INPUT +// bool soft_blocked = !!(rfkill->state & RFKILL_BLOCK_SW); +// +// if (!atomic_read(&rfkill_input_disabled)) +// __rfkill_switch_all(rfkill->type, soft_blocked); +//#endif +// } rfkill_send_events(rfkill, RFKILL_OP_ADD);