3.2.54-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: Yinghai Lu <ying...@kernel.org> commit e7cc5cf74544d97d7b69e2701595037474db1f96 upstream. The pcie_portdrv .probe() method calls pci_enable_device() once, in pcie_port_device_register(), but the .remove() method calls pci_disable_device() twice, in pcie_port_device_remove() and in pcie_portdrv_remove(). That causes a "disabling already-disabled device" warning when removing a PCIe port device. This happens all the time when removing Thunderbolt devices, but is also easy to reproduce with, e.g., "echo 0000:00:1c.3 > /sys/bus/pci/drivers/pcieport/unbind" This patch removes the disable from pcie_portdrv_remove(). [bhelgaas: changelog, tag for stable] Reported-by: David Bulkow <david.bul...@stratus.com> Reported-by: Mika Westerberg <mika.westerb...@linux.intel.com> Signed-off-by: Yinghai Lu <ying...@kernel.org> Signed-off-by: Bjorn Helgaas <bhelg...@google.com> Signed-off-by: Ben Hutchings <b...@decadent.org.uk> --- drivers/pci/pcie/portdrv_pci.c | 1 - 1 file changed, 1 deletion(-) --- a/drivers/pci/pcie/portdrv_pci.c +++ b/drivers/pci/pcie/portdrv_pci.c @@ -151,7 +151,6 @@ static int __devinit pcie_portdrv_probe( static void pcie_portdrv_remove(struct pci_dev *dev) { pcie_port_device_remove(dev); - pci_disable_device(dev); } static int error_detected_iter(struct device *device, void *data) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/