aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ptp/ptp_clock.c
diff options
context:
space:
mode:
authorJonathan Lemon <jonathan.lemon@gmail.com>2021-07-08 11:04:08 -0700
committerDavid S. Miller <davem@davemloft.net>2021-07-08 12:33:10 -0700
commitdebdd8e31895fdd1e2cfeb7a5aff1c83e49a91ba (patch)
tree22a6aab66a8788b3e917f75ed1350aa8519f554b /drivers/ptp/ptp_clock.c
parentipv6: tcp: drop silly ICMPv6 packet too big messages (diff)
downloadlinux-dev-debdd8e31895fdd1e2cfeb7a5aff1c83e49a91ba.tar.xz
linux-dev-debdd8e31895fdd1e2cfeb7a5aff1c83e49a91ba.zip
ptp: Relocate lookup cookie to correct block.
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> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ptp/ptp_clock.c')
-rw-r--r--drivers/ptp/ptp_clock.c2
1 files changed, 1 insertions, 1 deletions
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. */