Message ID | 20221009053245.154922-1-dzm91@hust.edu.cn (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | usb: cdns3: adjust the partial logic of cdnsp_pci_remove | expand |
On Sun, Oct 09, 2022 at 01:32:45PM +0800, Dongliang Mu wrote: > From: Dongliang Mu <mudongliangabcd@gmail.com> > > In cdnsp_pci_remove, if pci_is_enabled returns true, it will > call cdns_remove; else it will call kfree. Then both control flow > goes to pci_dev_put. > > Adjust this logic by modifying it to an if else. > > Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com> Your email address does not match your From: address, and your From: address is saying it is being spoofed and not correct :( Please work with your school to fix your email system and do not use gmail to hide it. thanks, greg k-h
On Sun, Oct 9, 2022 at 2:52 PM Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote: > > On Sun, Oct 09, 2022 at 01:32:45PM +0800, Dongliang Mu wrote: > > From: Dongliang Mu <mudongliangabcd@gmail.com> > > > > In cdnsp_pci_remove, if pci_is_enabled returns true, it will > > call cdns_remove; else it will call kfree. Then both control flow > > goes to pci_dev_put. > > > > Adjust this logic by modifying it to an if else. > > > > Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com> > > Your email address does not match your From: address, and your From: > address is saying it is being spoofed and not correct :( > > Please work with your school to fix your email system and do not use > gmail to hide it. My git config uses Gmail. I forget to change this after I joined the new school and changed sendmail configuration. I sent a new version several minutes ago. > > thanks, > > greg k-h
diff --git a/drivers/usb/cdns3/cdnsp-pci.c b/drivers/usb/cdns3/cdnsp-pci.c index fe8a114c586c..efd54ed918b9 100644 --- a/drivers/usb/cdns3/cdnsp-pci.c +++ b/drivers/usb/cdns3/cdnsp-pci.c @@ -192,14 +192,12 @@ static void cdnsp_pci_remove(struct pci_dev *pdev) if (pci_dev_run_wake(pdev)) pm_runtime_get_noresume(&pdev->dev); - if (!pci_is_enabled(func)) { + if (pci_is_enabled(func)) { + cdns_remove(cdnsp); + } else { kfree(cdnsp); - goto pci_put; } - cdns_remove(cdnsp); - -pci_put: pci_dev_put(func); }