From e6c33e6701901b3c1be3b0616f6546de575871fb Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Mon, 20 Oct 2008 21:46:01 -0700 Subject: [PATCH] --- yaml --- r: 127211 b: refs/heads/master c: 8e8ce4b642ce4beb865fb1d67cd8ea883d9ae7d7 h: refs/heads/master i: 127209: 4fccd76eb2db606dcc4e3527acf70e497d5b05cc 127207: c501f7ef697a25eb14174c1250c3abf87aae6490 v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/pci-quirks.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index b61294658b18..cc5a7790c110 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e64a5219296fff11a0da0322b43012265cd3b327 +refs/heads/master: 8e8ce4b642ce4beb865fb1d67cd8ea883d9ae7d7 diff --git a/trunk/drivers/usb/host/pci-quirks.c b/trunk/drivers/usb/host/pci-quirks.c index ae6e70edd745..15e4f1d92c79 100644 --- a/trunk/drivers/usb/host/pci-quirks.c +++ b/trunk/drivers/usb/host/pci-quirks.c @@ -172,9 +172,9 @@ static void __devinit quirk_usb_handoff_ohci(struct pci_dev *pdev) if (!mmio_resource_enabled(pdev, 0)) return; - base = ioremap_nocache(pci_resource_start(pdev, 0), - pci_resource_len(pdev, 0)); - if (base == NULL) return; + base = pci_ioremap_bar(pdev, 0); + if (base == NULL) + return; /* On PA-RISC, PDC can leave IR set incorrectly; ignore it there. */ #ifndef __hppa__ @@ -221,9 +221,9 @@ static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev) if (!mmio_resource_enabled(pdev, 0)) return; - base = ioremap_nocache(pci_resource_start(pdev, 0), - pci_resource_len(pdev, 0)); - if (base == NULL) return; + base = pci_ioremap_bar(pdev, 0); + if (base == NULL) + return; cap_length = readb(base); op_reg_base = base + cap_length;