From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932432Ab2CATZH (ORCPT ); Thu, 1 Mar 2012 14:25:07 -0500 Received: from rcsinet15.oracle.com ([148.87.113.117]:23013 "EHLO rcsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932287Ab2CATZD (ORCPT ); Thu, 1 Mar 2012 14:25:03 -0500 From: Yinghai Lu To: Sarah Sharp , Greg Kroah-Hartman , Jesse Barnes Cc: linux-usb@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Yinghai Lu Subject: [RFC PATCH 2/3] usb, PCI: remove disable/enable device with non-xhci quirk Date: Thu, 1 Mar 2012 11:24:02 -0800 Message-Id: <1330629843-6027-2-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1330629843-6027-1-git-send-email-yinghai@kernel.org> References: <1330629843-6027-1-git-send-email-yinghai@kernel.org> X-Source-IP: ucsinet21.oracle.com [156.151.31.93] X-CT-RefId: str=0001.0A090204.4F4FCCEE.0098,ss=1,re=0.000,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org | commit cab928ee1f221c9cc48d6615070fefe2e444384a | USB: Fix handoff when BIOS disables host PCI device. mention only need to do disable/enable for xhci controller. So just remove that for non-xhci controller and restore old behavior for them. Signed-off-by: Yinghai Lu --- drivers/usb/host/pci-quirks.c | 18 ------------------ 1 file changed, 18 deletions(-) Index: linux-2.6/drivers/usb/host/pci-quirks.c =================================================================== --- linux-2.6.orig/drivers/usb/host/pci-quirks.c +++ linux-2.6/drivers/usb/host/pci-quirks.c @@ -889,13 +889,7 @@ static void __devinit quirk_usb_early_ha if (pdev->vendor == 0x184e) /* vendor Netlogic */ return; - if (pci_enable_device(pdev) < 0) { - dev_warn(&pdev->dev, "Can't enable PCI device, " - "BIOS handoff failed.\n"); - return; - } quirk_usb_handoff_uhci(pdev); - pci_disable_device(pdev); } DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_SERIAL_USB_UHCI, 0, quirk_usb_early_handoff_uhci); @@ -908,13 +902,7 @@ static void __devinit quirk_usb_early_ha if (pdev->vendor == 0x184e) /* vendor Netlogic */ return; - if (pci_enable_device(pdev) < 0) { - dev_warn(&pdev->dev, "Can't enable PCI device, " - "BIOS handoff failed.\n"); - return; - } quirk_usb_handoff_ohci(pdev); - pci_disable_device(pdev); } DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_SERIAL_USB_OHCI, 0, quirk_usb_early_handoff_ohci); @@ -924,13 +912,7 @@ static void __devinit quirk_usb_early_ha if (pdev->vendor == 0x184e) /* vendor Netlogic */ return; - if (pci_enable_device(pdev) < 0) { - dev_warn(&pdev->dev, "Can't enable PCI device, " - "BIOS handoff failed.\n"); - return; - } quirk_usb_handoff_ehci(pdev); - pci_disable_device(pdev); } DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_SERIAL_USB_EHCI, 0, quirk_usb_early_handoff_ehci);