lkml.org 
[lkml]   [2013]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.11 032/272] PCI: Remove duplicate pci_disable_device() from pcie_portdrv_remove()
    Date
    3.11.10.1 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Yinghai Lu <yinghai@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.Bulkow@stratus.com>
    Reported-by: Mika Westerberg <mika.westerberg@linux.intel.com>
    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/pci/pcie/portdrv_pci.c | 1 -
    1 file changed, 1 deletion(-)

    diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
    index 696caed..ce8acc7 100644
    --- a/drivers/pci/pcie/portdrv_pci.c
    +++ b/drivers/pci/pcie/portdrv_pci.c
    @@ -223,7 +223,6 @@ static int pcie_portdrv_probe(struct pci_dev *dev,
    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)
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2013-12-06 15:42    [W:4.018 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site