From patchwork Thu Nov 18 13:52:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Assmann X-Patchwork-Id: 336241 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 oAIDrXLR011244 for ; Thu, 18 Nov 2010 13:53:34 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757982Ab0KRNxd (ORCPT ); Thu, 18 Nov 2010 08:53:33 -0500 Received: from mx1.redhat.com ([209.132.183.28]:22291 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757965Ab0KRNxc (ORCPT ); Thu, 18 Nov 2010 08:53:32 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oAIDqMVi016008 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 18 Nov 2010 08:52:22 -0500 Received: from localhost6.localdomain6 ([10.3.112.18]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id oAIDqILR021202; Thu, 18 Nov 2010 08:52:20 -0500 Date: Thu, 18 Nov 2010 08:52:18 -0500 From: Stefan Assmann To: linux-pci@vger.kernel.org Cc: JBeulich@novell.com, bjorn.helgaas@hp.com, linux-acpi@vger.kernel.org, Stefan Assmann , mingo@elte.hu, lenb@kernel.org, tglx@linutronix.de, Olaf.Dabrunz@gmx.net Message-Id: <20101118135227.2269.72184.sendpatchset@localhost6.localdomain6> In-Reply-To: <20101118135207.2269.2593.sendpatchset@localhost6.localdomain6> References: <20101118135207.2269.2593.sendpatchset@localhost6.localdomain6> Subject: [PATCH 2/4] ACPI: make acpi_pci_irq_find_prt_entry return a copy of a prt_entry X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 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 (demeter1.kernel.org [140.211.167.41]); Thu, 18 Nov 2010 13:53:34 +0000 (UTC) diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c index 3bc2164..02202a2 100644 --- a/drivers/acpi/pci_irq.c +++ b/drivers/acpi/pci_irq.c @@ -60,7 +60,7 @@ static inline char pin_name(int pin) static struct acpi_prt_entry *acpi_pci_irq_find_prt_entry(struct pci_dev *dev, int pin) { - struct acpi_prt_entry *entry; + struct acpi_prt_entry *entry, *entry_copy; int segment = pci_domain_nr(dev->bus); int bus = dev->bus->number; int device = PCI_SLOT(dev->devfn); @@ -72,7 +72,11 @@ static struct acpi_prt_entry *acpi_pci_irq_find_prt_entry(struct pci_dev *dev, && (device == entry->id.device) && (pin == entry->pin)) { spin_unlock(&acpi_prt_lock); - return entry; + entry_copy = kzalloc(sizeof(struct acpi_prt_entry), GFP_KERNEL); + if (!entry_copy) + return NULL; + memcpy(entry_copy, entry, sizeof(struct acpi_prt_entry)); + return entry_copy; } } spin_unlock(&acpi_prt_lock); @@ -384,6 +388,7 @@ int acpi_pci_irq_enable(struct pci_dev *dev) &link); else gsi = entry->index; + kfree(entry); } else gsi = -1; @@ -453,6 +458,8 @@ void acpi_pci_irq_disable(struct pci_dev *dev) else gsi = entry->index; + if (entry) + kfree(entry); /* * TBD: It might be worth clearing dev->irq by magic constant * (e.g. PCI_UNDEFINED_IRQ).