[PATCH] ptp: fix PTP PPS source's lookup cookie set

[PATCH] ptp: fix PTP PPS source's lookup cookie set

[Dario Binacchi]

The setting took place before the PTP PPS source was registered, so
ptp->pps_source was NULL.

Fixes: 8602e40fc813 ("ptp: Set lookup cookie when creating a PTP PPS source.")
Signed-off-by: Dario Binacchi <dariobin@libero.it>
---

 drivers/ptp/ptp_clock.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c
index a23a37a4d5dc..457129c07221 100644
--- a/drivers/ptp/ptp_clock.c
+++ b/drivers/ptp/ptp_clock.c
@@ -218,7 +218,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;
 	}
 
 	err = ptp_populate_pin_groups(ptp);
@@ -238,6 +237,8 @@ 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.17.1

Re: [PATCH] ptp: fix PTP PPS source's lookup cookie set

[David Miller]

this pastch does not apply to the current net tree, that is why I keep marking it "Not Applicable"
in patchwork.

Re: [PATCH] ptp: fix PTP PPS source's lookup cookie set

[dariobin]

Hi David,

> Il 08/07/2021 09:14 David Miller <davem@davemloft.net> ha scritto:
> 
>  
> this pastch does not apply to the current net tree, that is why I keep marking it "Not Applicable"
> in patchwork.

I applied and tested the patch this morning on the mainline kernel. What am I missing?
Should I wait for the merge windows to end?

Thanks and regards,
Dario

Re: [PATCH] ptp: fix PTP PPS source's lookup cookie set

[Jonathan Lemon]

On Thu, Jul 08, 2021 at 12:14:04AM -0700, David Miller wrote:
> this pastch does not apply to the current net tree, that is why I keep marking it "Not Applicable"
> in patchwork.

I'll send a patch against -net in a minue.  The earlier ones
were against -net-next, I didn't realize the window closed.
-- 
Jonathan