From patchwork Sat Dec 26 19:14:59 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Corbacho X-Patchwork-Id: 69795 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id nBQJFDdQ019283 for ; Sat, 26 Dec 2009 19:15:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753458AbZLZTPG (ORCPT ); Sat, 26 Dec 2009 14:15:06 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753181AbZLZTPG (ORCPT ); Sat, 26 Dec 2009 14:15:06 -0500 Received: from ey-out-2122.google.com ([74.125.78.26]:9897 "EHLO ey-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752847AbZLZTPE convert rfc822-to-8bit (ORCPT ); Sat, 26 Dec 2009 14:15:04 -0500 Received: by ey-out-2122.google.com with SMTP id 25so1034605eya.19 for ; Sat, 26 Dec 2009 11:15:01 -0800 (PST) Received: by 10.213.25.76 with SMTP id y12mr10014001ebb.26.1261854901341; Sat, 26 Dec 2009 11:15:01 -0800 (PST) Received: from pegasus.localnet (bb-87-81-255-5.ukonline.co.uk [87.81.255.5]) by mx.google.com with ESMTPS id 7sm21111225eyg.25.2009.12.26.11.15.00 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 26 Dec 2009 11:15:00 -0800 (PST) From: Carlos Corbacho To: Larry Finger Subject: [PATCH] ACPI: WMI: Handle duplicate GUIDs Date: Sat, 26 Dec 2009 19:14:59 +0000 User-Agent: KMail/1.12.4 (Linux/2.6.31.5; KDE/4.3.4; x86_64; ; ) Cc: Matthew Garrett , LKML , Linus Torvalds , Linux ACPI , lenb@kernel.org References: <4B352513.90302@lwfinger.net> <200912261836.41882.carlos@strangeworlds.co.uk> <4B365E56.9030302@lwfinger.net> In-Reply-To: <4B365E56.9030302@lwfinger.net> MIME-Version: 1.0 Message-Id: <200912261914.59515.carlos@strangeworlds.co.uk> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c index 9f93d6c..845aaf6 100644 --- a/drivers/platform/x86/wmi.c +++ b/drivers/platform/x86/wmi.c @@ -716,6 +716,22 @@ static int wmi_class_init(void) return ret; } +static bool guid_already_parsed(const char *guid_string) { + struct guid_block *gblock; + struct wmi_block *wblock; + struct list_head *p; + + list_for_each(p, &wmi_blocks.list) { + wblock = list_entry(p, struct wmi_block, list); + gblock = &wblock->gblock; + + if (strncmp(gblock->guid, guid_string, 16) == 0) { + return true; + } + } + return false; +} + /* * Parse the _WDG method for the GUID data blocks */ @@ -725,6 +741,7 @@ static __init acpi_status parse_wdg(acpi_handle handle) union acpi_object *obj; struct guid_block *gblock; struct wmi_block *wblock; + char guid_string[37]; acpi_status status; u32 i, total; @@ -747,6 +764,19 @@ static __init acpi_status parse_wdg(acpi_handle handle) memcpy(gblock, obj->buffer.pointer, obj->buffer.length); for (i = 0; i < total; i++) { + /* + Some WMI devices, like those for nVidia hooks, have a + duplicate GUID. It's not clear what we should do in this + case yet, so for now, we'll just ignore the duplicate. + Anyone who wants to add support for that device can come + up with a better workaround for the mess then. + */ + if (guid_already_parsed(gblock[i].guid) == true) { + wmi_gtoa(gblock[i].guid, guid_string); + printk(KERN_INFO PREFIX "Skipping duplicate GUID %s\n", + guid_string); + continue; + } wblock = kzalloc(sizeof(struct wmi_block), GFP_KERNEL); if (!wblock) return AE_NO_MEMORY;