diff options
| author | David S. Miller <davem@davemloft.net> | 2020-01-19 22:10:04 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-01-19 22:10:04 +0100 |
| commit | b3f7e3f23a763ccaae7b52d88d2c91e66c80d406 (patch) | |
| tree | e00e90eb161305ed9895315ba12e30ac17de9523 /drivers/ptp | |
| parent | Merge branch 'mlxsw-Add-tunnel-devlink-trap-support' (diff) | |
| parent | Merge tag 'riscv/for-v5.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| download | linux-b3f7e3f23a763ccaae7b52d88d2c91e66c80d406.tar.xz linux-b3f7e3f23a763ccaae7b52d88d2c91e66c80d406.zip | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net
Diffstat (limited to 'drivers/ptp')
| -rw-r--r-- | drivers/ptp/ptp_clock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c index da97a5bab26e..ac1f2bf9e888 100644 --- a/drivers/ptp/ptp_clock.c +++ b/drivers/ptp/ptp_clock.c @@ -170,6 +170,7 @@ static void ptp_clock_release(struct device *dev) { struct ptp_clock *ptp = container_of(dev, struct ptp_clock, dev); + ptp_cleanup_pin_groups(ptp); mutex_destroy(&ptp->tsevq_mux); mutex_destroy(&ptp->pincfg_mux); ida_simple_remove(&ptp_clocks_map, ptp->index); @@ -302,9 +303,8 @@ int ptp_clock_unregister(struct ptp_clock *ptp) if (ptp->pps_source) pps_unregister_source(ptp->pps_source); - ptp_cleanup_pin_groups(ptp); - posix_clock_unregister(&ptp->clock); + return 0; } EXPORT_SYMBOL(ptp_clock_unregister); |