On 24/05/19 5:27 AM, Alan Mikhak wrote: > +Bjorn Helgaas > > On Thu, May 23, 2019 at 2:46 PM Alan Mikhak <alan.mikhak@xxxxxxxxxx> wrote: >> >> Set endpoint controller pointer to null in pci_epc_remove_epf() >> to avoid -EBUSY on subsequent call to pci_epc_add_epf(). >> >> Requires checking for null endpoint function pointer. >> >> Signed-off-by: Alan Mikhak <alan.mikhak@xxxxxxxxxx> Acked-by: Kishon Vijay Abraham I <kishon@xxxxxx> >> --- >> drivers/pci/endpoint/pci-epc-core.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/pci/endpoint/pci-epc-core.c b/drivers/pci/endpoint/pci-epc-core.c >> index e4712a0f249c..2091508c1620 100644 >> --- a/drivers/pci/endpoint/pci-epc-core.c >> +++ b/drivers/pci/endpoint/pci-epc-core.c >> @@ -519,11 +519,12 @@ void pci_epc_remove_epf(struct pci_epc *epc, struct pci_epf *epf) >> { >> unsigned long flags; >> >> - if (!epc || IS_ERR(epc)) >> + if (!epc || IS_ERR(epc) || !epf) >> return; >> >> spin_lock_irqsave(&epc->lock, flags); >> list_del(&epf->list); >> + epf->epc = NULL; >> spin_unlock_irqrestore(&epc->lock, flags); >> } >> EXPORT_SYMBOL_GPL(pci_epc_remove_epf); >> -- >> 2.7.4 >>