Skip to content

Revert "ptp: remove ptp->n_vclocks check logic in ptp_vclock_in_use()" #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 23, 2025
Merged

Revert "ptp: remove ptp->n_vclocks check logic in ptp_vclock_in_use()" #239

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion drivers/ptp/ptp_private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,17 @@ static inline int queue_cnt(const struct timestamp_event_queue *q)
/* Check if ptp virtual clock is in use */
static inline bool ptp_vclock_in_use(struct ptp_clock *ptp)
{
return !ptp->is_virtual_clock;
bool in_use = false;

if (mutex_lock_interruptible(&ptp->n_vclocks_mux))
return true;

if (!ptp->is_virtual_clock && ptp->n_vclocks)
in_use = true;

mutex_unlock(&ptp->n_vclocks_mux);

return in_use;
}

/* Check if ptp clock shall be free running */
Expand Down