lkml.org 
[lkml]   [2014]   [May]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 004/151] [3.13-stable] Revert "PCI: Enable INTx in pci_reenable_device() only when MSI/MSI-X not enabled"
    Date
    3.13.11.1 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Kamal Mostafa <kamal@canonical.com>

    This reverts commit 16d36cdf2bd2b8e821ea1286dd3e8b2d657e6b3c.

    ... which was applied to 3.13-stable twice, first as:
    bb7048ea362773c2b53ee410a69ff60a029c71ef
    and then again as:
    16d36cdf2bd2b8e821ea1286dd3e8b2d657e6b3c

    This revert relates only to 3.13-stable, and the fix itself remains in 3.13.

    Cc: Bjorn Helgaas <bhelgaas@google.com>
    Cc: Sarah Sharp <sarah.a.sharp@linux.intel.com>
    Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/pci/pci.c | 3 ---
    1 file changed, 3 deletions(-)

    diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
    index 6f01c74..1a8a4fd 100644
    --- a/drivers/pci/pci.c
    +++ b/drivers/pci/pci.c
    @@ -1134,9 +1134,6 @@ static int do_pci_enable_device(struct pci_dev *dev, int bars)
    if (dev->msi_enabled || dev->msix_enabled)
    return 0;

    - if (dev->msi_enabled || dev->msix_enabled)
    - return 0;
    -
    pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
    if (pin) {
    pci_read_config_word(dev, PCI_COMMAND, &cmd);
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-05-02 20:01    [W:4.020 / U:0.184 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site