Commit b8222fe2 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/endpoint/core' 

- Fix configfs epf_group removal, which incorrectly did a list_del() on a
  list head, not a list entry (Damien Le Moal)

* pci/endpoint/core:
  PCI: endpoint: Fix configfs group removal on driver teardown
  PCI: endpoint: Fix configfs group list head handling
parents 11fdf087 910bdb81

drivers/pci/endpoint/pci-ep-cfs.c

+1 −0
Original line number Diff line number Diff line
@@ -691,6 +691,7 @@ void pci_ep_cfs_remove_epf_group(struct config_group *group) 
	if (IS_ERR_OR_NULL(group))

		return;



	list_del(&group->group_entry);

	configfs_unregister_default_group(group);

}

EXPORT_SYMBOL(pci_ep_cfs_remove_epf_group);

drivers/pci/endpoint/pci-epf-core.c

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static void pci_epf_remove_cfs(struct pci_epf_driver *driver) 
	mutex_lock(&pci_epf_mutex);

	list_for_each_entry_safe(group, tmp, &driver->epf_group, group_entry)

		pci_ep_cfs_remove_epf_group(group);

	list_del(&driver->epf_group);

	WARN_ON(!list_empty(&driver->epf_group));

	mutex_unlock(&pci_epf_mutex);

}