| Message ID | 20220308000458.2166-1-jonathan.lemon@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 4587369b6cba3772b6e92ec3d28854ec7d82a95d |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,v2] ptp: ocp: correct label for error path | expand |
Hello: This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Mon, 7 Mar 2022 16:04:58 -0800 you wrote: > When devlink_register() was removed from the error path, the > corresponding label was not updated. Rename the label for > readability puposes, no functional change. > > Signed-off-by: Jonathan Lemon <jonathan.lemon@gmail.com> > --- > drivers/ptp/ptp_ocp.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Here is the summary with links: - [net-next,v2] ptp: ocp: correct label for error path https://git.kernel.org/netdev/net-next/c/4587369b6cba You are awesome, thank you!
diff --git a/drivers/ptp/ptp_ocp.c b/drivers/ptp/ptp_ocp.c index aaefca6c2422..5e3e06acaf87 100644 --- a/drivers/ptp/ptp_ocp.c +++ b/drivers/ptp/ptp_ocp.c @@ -2608,7 +2608,7 @@ ptp_ocp_probe(struct pci_dev *pdev, const struct pci_device_id *id) err = pci_enable_device(pdev); if (err) { dev_err(&pdev->dev, "pci_enable_device\n"); - goto out_unregister; + goto out_free; } bp = devlink_priv(devlink); @@ -2654,7 +2654,7 @@ ptp_ocp_probe(struct pci_dev *pdev, const struct pci_device_id *id) pci_set_drvdata(pdev, NULL); out_disable: pci_disable_device(pdev); -out_unregister: +out_free: devlink_free(devlink); return err; }
When devlink_register() was removed from the error path, the corresponding label was not updated. Rename the label for readability puposes, no functional change. Signed-off-by: Jonathan Lemon <jonathan.lemon@gmail.com> --- drivers/ptp/ptp_ocp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)