From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932741AbbCCX3Y (ORCPT ); Tue, 3 Mar 2015 18:29:24 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:36738 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932216AbbCCXVd (ORCPT ); Tue, 3 Mar 2015 18:21:33 -0500 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org Date: Tue, 03 Mar 2015 22:11:28 +0000 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) Subject: [PATCH 3.2 01/24] PCI: quirks: Fix backport of quirk_io() In-Reply-To: X-SA-Exim-Connect-IP: 192.168.4.249 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.2.68-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Ben Hutchings Commit 06cf35f903aa ('PCI: Handle read-only BARs on AMD CS553x devices') added the function quirk_io() which calls pcibios_bus_to_resource(). Prior to Linux 3.14, pcibios_bus_to_resource() takes a pointer to struct pci_dev and looks up the device's bus itself, so we need to pass dev not dev->bus. Signed-off-by: Ben Hutchings --- --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -409,7 +409,7 @@ static void quirk_io(struct pci_dev *dev /* Convert from PCI bus to resource space */ bus_region.start = region; bus_region.end = region + size - 1; - pcibios_bus_to_resource(dev->bus, res, &bus_region); + pcibios_bus_to_resource(dev, res, &bus_region); dev_info(&dev->dev, FW_BUG "%s quirk: reg 0x%x: %pR\n", name, PCI_BASE_ADDRESS_0 + (pos << 2), res);