Netdev Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH net] ptp: Relocate lookup cookie to correct block.
@ 2021-07-08 18:04 Jonathan Lemon
  2021-07-08 19:40 ` patchwork-bot+netdevbpf
  2021-07-10 13:13 ` dariobin
  0 siblings, 2 replies; 6+ messages in thread
From: Jonathan Lemon @ 2021-07-08 18:04 UTC (permalink / raw)
  To: davem, dariobin, richardcochran; +Cc: kernel-team, netdev

An earlier commit set the pps_lookup cookie, but the line
was somehow added to the wrong code block.  Correct this.

Fixes: 8602e40fc813 ("ptp: Set lookup cookie when creating a PTP PPS source.")
Signed-off-by: Jonathan Lemon <jonathan.lemon@gmail.com>
Signed-off-by: Dario Binacchi <dariobin@libero.it>
Acked-by: Richard Cochran <richardcochran@gmail.com>
---
 drivers/ptp/ptp_clock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c
index ce6d9fc85607..4dfc52e06704 100644
--- a/drivers/ptp/ptp_clock.c
+++ b/drivers/ptp/ptp_clock.c
@@ -232,7 +232,6 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
 			pr_err("failed to create ptp aux_worker %d\n", err);
 			goto kworker_err;
 		}
-		ptp->pps_source->lookup_cookie = ptp;
 	}
 
 	/* PTP virtual clock is being registered under physical clock */
@@ -268,6 +267,7 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
 			pr_err("failed to register pps source\n");
 			goto no_pps;
 		}
+		ptp->pps_source->lookup_cookie = ptp;
 	}
 
 	/* Initialize a new device of our class in our clock structure. */
-- 
2.30.2


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2021-07-12  3:16 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-08 18:04 [PATCH net] ptp: Relocate lookup cookie to correct block Jonathan Lemon
2021-07-08 19:40 ` patchwork-bot+netdevbpf
2021-07-10 13:13 ` dariobin
2021-07-10 16:56   ` Jonathan Lemon
2021-07-10 17:09     ` dariobin
2021-07-12  3:16     ` Richard Cochran

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).