diff options
author | Doug Ledford <dledford@redhat.com> | 2017-08-18 21:10:23 +0300 |
---|---|---|
committer | Doug Ledford <dledford@redhat.com> | 2017-08-18 21:10:23 +0300 |
commit | d3cf4d9915c4fb60aeef580973aa77420e600746 (patch) | |
tree | 101f4c94eaa9d4c11673a41a7e5f2280fa59227d /drivers/pci/pci-driver.c | |
parent | 3e5f0881f17525e3b49835947a5e0cf2d681b1e2 (diff) | |
parent | 9d6fd7aca149e2c95915447f76b125dc2123db45 (diff) | |
download | linux-d3cf4d9915c4fb60aeef580973aa77420e600746.tar.xz |
Merge branch 'misc' into k.o/for-next
Conflicts:
drivers/infiniband/core/iwcm.c - The rdma_netlink patches in
HEAD and the iwarp cm workqueue fix (don't use WQ_MEM_RECLAIM,
we aren't safe for that context) touched the same code.
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/pci/pci-driver.c')
-rw-r--r-- | drivers/pci/pci-driver.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index d51e8738f9c2..4450feaf5c00 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -1307,6 +1307,7 @@ int __pci_register_driver(struct pci_driver *drv, struct module *owner, drv->driver.bus = &pci_bus_type; drv->driver.owner = owner; drv->driver.mod_name = mod_name; + drv->driver.groups = drv->groups; spin_lock_init(&drv->dynids.lock); INIT_LIST_HEAD(&drv->dynids.list); |