From: Dan Carpenter <dan.carpenter@oracle.com>
To: Richard Cochran <richardcochran@gmail.com>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel-janitors@vger.kernel.org
Subject: [PATCH] ptp: fix an IS_ERR() vs NULL check
Date: Fri, 30 Nov 2018 15:58:34 +0300 [thread overview]
Message-ID: <20181130125834.u42dhxgof66rhya2@kili.mountain> (raw)
The pps_register_source() function doesn't return NULL, it returns
error pointers.
Fixes: d94ba80ebbea ("ptp: Added a brand new class driver for ptp clocks.")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/ptp/ptp_clock.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c
index 8a81eecc0ecd..48f3594a7458 100644
--- a/drivers/ptp/ptp_clock.c
+++ b/drivers/ptp/ptp_clock.c
@@ -265,8 +265,8 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
pps.mode = PTP_PPS_MODE;
pps.owner = info->owner;
ptp->pps_source = pps_register_source(&pps, PTP_PPS_DEFAULTS);
- if (!ptp->pps_source) {
- err = -EINVAL;
+ if (IS_ERR(ptp->pps_source)) {
+ err = PTR_ERR(ptp->pps_source);
pr_err("failed to register pps source\n");
goto no_pps;
}
--
2.11.0
next reply other threads:[~2018-11-30 12:58 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-30 12:58 Dan Carpenter [this message]
2018-11-30 16:32 ` [PATCH] ptp: fix an IS_ERR() vs NULL check Richard Cochran
2018-12-03 10:04 ` Dan Carpenter
[not found] ` <20181203105506.GA21127@unbuntlaptop>
2018-12-04 4:42 ` [PATCH v2] " Richard Cochran
2018-12-04 7:00 ` Dan Carpenter
2018-12-04 10:54 ` Greg Kroah-Hartman
2018-12-04 14:55 ` Richard Cochran
2018-12-04 15:10 ` Dan Carpenter
2018-12-06 12:38 ` Richard Cochran
2018-12-06 13:57 ` Greg Kroah-Hartman
2018-12-07 6:00 ` [PATCH v3] " Dan Carpenter
2018-12-12 14:17 ` Richard Cochran
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181130125834.u42dhxgof66rhya2@kili.mountain \
--to=dan.carpenter@oracle.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=richardcochran@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).