lkml.org 
[lkml]   [2020]   [Dec]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 05/50] PCI: Add device even if driver attach failed
    Date
    From: Rajat Jain <rajatja@google.com>

    commit 2194bc7c39610be7cabe7456c5f63a570604f015 upstream.

    device_attach() returning failure indicates a driver error while trying to
    probe the device. In such a scenario, the PCI device should still be added
    in the system and be visible to the user.

    When device_attach() fails, merely warn about it and keep the PCI device in
    the system.

    This partially reverts ab1a187bba5c ("PCI: Check device_attach() return
    value always").

    Link: https://lore.kernel.org/r/20200706233240.3245512-1-rajatja@google.com
    Signed-off-by: Rajat Jain <rajatja@google.com>
    Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
    Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Cc: stable@vger.kernel.org # v4.6+
    [sudip: use dev_warn]
    Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/pci/bus.c | 6 +-----
    1 file changed, 1 insertion(+), 5 deletions(-)

    --- a/drivers/pci/bus.c
    +++ b/drivers/pci/bus.c
    @@ -324,12 +324,8 @@ void pci_bus_add_device(struct pci_dev *

    dev->match_driver = true;
    retval = device_attach(&dev->dev);
    - if (retval < 0 && retval != -EPROBE_DEFER) {
    + if (retval < 0 && retval != -EPROBE_DEFER)
    dev_warn(&dev->dev, "device attach failed (%d)\n", retval);
    - pci_proc_detach_device(dev);
    - pci_remove_sysfs_dev_files(dev);
    - return;
    - }

    dev->is_added = 1;
    }

    \
     
     \ /
      Last update: 2020-12-01 10:10    [W:3.142 / U:0.368 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site