drivers/ptp/ptp_clock.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
Signed-off-by: Tinsae Tadesse <tinsaetadesse2015@gmail.com>
---
drivers/ptp/ptp_clock.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c
index b0e167c0b3eb..5374b3e9ad15 100644
--- a/drivers/ptp/ptp_clock.c
+++ b/drivers/ptp/ptp_clock.c
@@ -323,8 +323,7 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
size_t size;
if (WARN_ON_ONCE(info->n_alarm > PTP_MAX_ALARMS ||
- (!info->gettimex64 && !info->gettime64) ||
- !info->settime64))
+ (!info->gettimex64 && !info->gettime64)))
return ERR_PTR(-EINVAL);
/* Initialize a clock structure. */
--
2.47.3
On 12/29/25 6:32 PM, Tinsae Tadesse wrote: > Signed-off-by: Tinsae Tadesse <tinsaetadesse2015@gmail.com> > --- > drivers/ptp/ptp_clock.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c > index b0e167c0b3eb..5374b3e9ad15 100644 > --- a/drivers/ptp/ptp_clock.c > +++ b/drivers/ptp/ptp_clock.c > @@ -323,8 +323,7 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info, > size_t size; > > if (WARN_ON_ONCE(info->n_alarm > PTP_MAX_ALARMS || > - (!info->gettimex64 && !info->gettime64) || > - !info->settime64)) > + (!info->gettimex64 && !info->gettime64))) > return ERR_PTR(-EINVAL); > > /* Initialize a clock structure. */ I guess this is an attempt to address the following issue: https://lore.kernel.org/all/20251108044822.GA3262936@ax162/ If so, it's already fixed by commit 81d90d93d22ca4f61833cba921dce9a0bd82218f /P
On Tue, Dec 30, 2025 at 12:42 PM Paolo Abeni <pabeni@redhat.com> wrote: > > On 12/29/25 6:32 PM, Tinsae Tadesse wrote: > > Signed-off-by: Tinsae Tadesse <tinsaetadesse2015@gmail.com> > > --- > > drivers/ptp/ptp_clock.c | 3 +-- > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c > > index b0e167c0b3eb..5374b3e9ad15 100644 > > --- a/drivers/ptp/ptp_clock.c > > +++ b/drivers/ptp/ptp_clock.c > > @@ -323,8 +323,7 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info, > > size_t size; > > > > if (WARN_ON_ONCE(info->n_alarm > PTP_MAX_ALARMS || > > - (!info->gettimex64 && !info->gettime64) || > > - !info->settime64)) > > + (!info->gettimex64 && !info->gettime64))) > > return ERR_PTR(-EINVAL); > > > > /* Initialize a clock structure. */ > > I guess this is an attempt to address the following issue: > > https://lore.kernel.org/all/20251108044822.GA3262936@ax162/ > > If so, it's already fixed by commit 81d90d93d22ca4f61833cba921dce9a0bd82218f > > /P > Hi Paolo, Thanks for the update!
On 29/12/2025 17:32, Tinsae Tadesse wrote: > Signed-off-by: Tinsae Tadesse <tinsaetadesse2015@gmail.com> > --- > drivers/ptp/ptp_clock.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c > index b0e167c0b3eb..5374b3e9ad15 100644 > --- a/drivers/ptp/ptp_clock.c > +++ b/drivers/ptp/ptp_clock.c > @@ -323,8 +323,7 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info, > size_t size; > > if (WARN_ON_ONCE(info->n_alarm > PTP_MAX_ALARMS || > - (!info->gettimex64 && !info->gettime64) || > - !info->settime64)) > + (!info->gettimex64 && !info->gettime64))) > return ERR_PTR(-EINVAL); > > /* Initialize a clock structure. */ Could you please tell us a bit more about reasoning for this patch?
© 2016 - 2026 Red Hat, Inc.