From patchwork Mon Feb 22 16:03:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Jenkins X-Patchwork-Id: 81172 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1MG3d9P027345 for ; Mon, 22 Feb 2010 16:04:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754195Ab0BVQEF (ORCPT ); Mon, 22 Feb 2010 11:04:05 -0500 Received: from ey-out-2122.google.com ([74.125.78.24]:47335 "EHLO ey-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754133Ab0BVQEC (ORCPT ); Mon, 22 Feb 2010 11:04:02 -0500 Received: by ey-out-2122.google.com with SMTP id d26so587196eyd.19 for ; Mon, 22 Feb 2010 08:04:00 -0800 (PST) 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=NoSkR3s9MNPbsVwp65xzeMv6MunovCNeGPHd8qfS9vc=; b=m/ioRcOKrAz6TiIIXxgHTd+VtD1KXYJJIyFWYB0NT+809l0Fc3FdmzUQ+onAoreE9+ MqyiaLjMlovM7VfrUzeinHPId+2QYfwR6ZCdD5AfsDyHNVHW9EFM2/DmsEwIDY9tYIZ3 cnEb+TQJdzn1g7gtL7dX9wA+WuOgh4DCXYwWY= 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=tsVtrUbWbNN3kedrGgZeuOmavRmBAwm8WjGMpz/jzNeK+lz7AZhjtEGV3LfYaN9Slw Zgpb24LmqiaiQNVlxfhYYe8Q4xQqpvYhaIQMnQ13k5FX9JmSkc3G9G8zkoVpPL7f75jv eWaEormIE1gnxKGhQFSC7t08aDAw9INnq9nh4= Received: by 10.213.1.133 with SMTP id 5mr3870289ebf.83.1266854640588; Mon, 22 Feb 2010 08:04:00 -0800 (PST) Received: from ?192.168.0.4? ([86.53.68.233]) by mx.google.com with ESMTPS id 15sm2503639ewy.8.2010.02.22.08.03.59 (version=SSLv3 cipher=RC4-MD5); Mon, 22 Feb 2010 08:04:00 -0800 (PST) Message-ID: <4B82AAEE.9060805@tuffmail.co.uk> Date: Mon, 22 Feb 2010 16:03:58 +0000 From: Alan Jenkins User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: linux acpi CC: Corentin Chary , linux-kernel Subject: [PATCH] eeepc-laptop: check wireless hotplug events 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.3 (demeter.kernel.org [140.211.167.41]); Mon, 22 Feb 2010 16:04:07 +0000 (UTC) diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c index 6a47bb7..9a844ca 100644 --- a/drivers/platform/x86/eeepc-laptop.c +++ b/drivers/platform/x86/eeepc-laptop.c @@ -578,6 +578,8 @@ static void eeepc_rfkill_hotplug(struct eeepc_laptop *eeepc) struct pci_dev *dev; struct pci_bus *bus; bool blocked = eeepc_wlan_rfkill_blocked(eeepc); + bool absent; + u32 l; if (eeepc->wlan_rfkill) rfkill_set_sw_state(eeepc->wlan_rfkill, blocked); @@ -591,6 +593,22 @@ static void eeepc_rfkill_hotplug(struct eeepc_laptop *eeepc) goto out_unlock; } + if (pci_bus_read_config_dword(bus, 0, PCI_VENDOR_ID, &l)) { + pr_err("Unable to read PCI config space?\n"); + goto out_unlock; + } + absent = (l == 0xffffffff); + + if (blocked != absent) { + pr_warning("BIOS says wireless lan is %s, " + "but the pci device is %s\n", + blocked ? "blocked" : "unblocked", + absent ? "absent" : "present"); + pr_warning("skipped wireless hotplug as probably " + "inappropriate for this model\n"); + goto out_unlock; + } + if (!blocked) { dev = pci_get_slot(bus, 0); if (dev) {