From patchwork Sun Aug 2 15:56:51 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Jenkins X-Patchwork-Id: 38767 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 n72FnJdp005313 for ; Sun, 2 Aug 2009 15:56:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752895AbZHBP4w (ORCPT ); Sun, 2 Aug 2009 11:56:52 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752919AbZHBP4w (ORCPT ); Sun, 2 Aug 2009 11:56:52 -0400 Received: from mail-ew0-f214.google.com ([209.85.219.214]:35842 "EHLO mail-ew0-f214.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752895AbZHBP4w (ORCPT ); Sun, 2 Aug 2009 11:56:52 -0400 Received: by mail-ew0-f214.google.com with SMTP id 10so2535576ewy.37 for ; Sun, 02 Aug 2009 08:56:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:sender:message-id:date:from :user-agent:mime-version:to:cc:subject:content-type :content-transfer-encoding; bh=x4ZFlJasI4lW6c9xFK/5AbG6W063eQuOC8XFJ/DL3iQ=; b=PhpLz+PNmfjbUcc/gD6CAYhz70YNSTr7FHxM9dNzNkzUfWikR0f7V06CCSIjWCNai9 1uq54kA94J/D0EC8VwWQ8ZiZu+c2Nl/7VIJI1x53W1dalKkl1+docLl024jBKjBgjg1s OtZKoqHwK4P2JJUsJLUZXDPDM2vwQNLgUWsW8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; b=T/GSQLBg7uCX6+of3iKnb6PSAIJkZ8Zm8PbNDc8jgW3Txc4JNBF41S+YpqEGu4PgLc jKciSH8wRpuPizBFWprHUI9lNCigGcAq7gCc65E9ARMFRz+7XmIEEQFw03QeWOUh1XVS vAxlCz2uQVYcLPR91+QBIixiYGiK2X0sba6X8= Received: by 10.210.20.17 with SMTP id 17mr6093566ebt.80.1249228612808; Sun, 02 Aug 2009 08:56:52 -0700 (PDT) Received: from ?192.168.0.2? ([86.53.68.233]) by mx.google.com with ESMTPS id 10sm5326115eyd.22.2009.08.02.08.56.52 (version=SSLv3 cipher=RC4-MD5); Sun, 02 Aug 2009 08:56:52 -0700 (PDT) Message-ID: <4A75B743.2040705@tuffmail.co.uk> Date: Sun, 02 Aug 2009 16:56:51 +0100 From: Alan Jenkins User-Agent: Thunderbird 2.0.0.21 (X11/20090318) MIME-Version: 1.0 To: Corentin Chary CC: acpi4asus-user@lists.sourceforge.net, linux-acpi@vger.kernel.org Subject: [PATCH 5/8] eeepc-laptop: remove redundant rfkill_set_sw_state in resume handler Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org rfkill_set_sw_state() will already be called by eeepc_rfkill_hotplug(). Signed-off-by: Alan Jenkins --- drivers/platform/x86/eeepc-laptop.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c index 298dac9..7f7573a 100644 --- a/drivers/platform/x86/eeepc-laptop.c +++ b/drivers/platform/x86/eeepc-laptop.c @@ -835,8 +835,7 @@ static int eeepc_hotk_resume(struct acpi_device *device) wlan = get_acpi(CM_ASL_WLAN); set_acpi(CM_ASL_WLAN, wlan); - rfkill_set_sw_state(ehotk->wlan_rfkill, wlan != 1); - + /* Refresh both rfkill state and pci hotplug */ eeepc_rfkill_hotplug(); }