Skip to content

Commit b6b19a7

Browse files
Yang Yingliangdavem330
authored andcommitted
ptp: free 'vclock_index' in ptp_clock_release()
'vclock_index' is accessed from sysfs, it shouled be freed in release function, so move it from ptp_clock_unregister() to ptp_clock_release(). Signed-off-by: Yang Yingliang <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent bf6abf3 commit b6b19a7

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

drivers/ptp/ptp_clock.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ static void ptp_clock_release(struct device *dev)
170170
struct ptp_clock *ptp = container_of(dev, struct ptp_clock, dev);
171171

172172
ptp_cleanup_pin_groups(ptp);
173+
kfree(ptp->vclock_index);
173174
mutex_destroy(&ptp->tsevq_mux);
174175
mutex_destroy(&ptp->pincfg_mux);
175176
mutex_destroy(&ptp->n_vclocks_mux);
@@ -286,8 +287,6 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
286287
if (ptp->pps_source)
287288
pps_unregister_source(ptp->pps_source);
288289

289-
kfree(ptp->vclock_index);
290-
291290
if (ptp->kworker)
292291
kthread_destroy_worker(ptp->kworker);
293292

@@ -328,8 +327,6 @@ int ptp_clock_unregister(struct ptp_clock *ptp)
328327
ptp->defunct = 1;
329328
wake_up_interruptible(&ptp->tsev_wq);
330329

331-
kfree(ptp->vclock_index);
332-
333330
if (ptp->kworker) {
334331
kthread_cancel_delayed_work_sync(&ptp->aux_work);
335332
kthread_destroy_worker(ptp->kworker);

0 commit comments

Comments
 (0)