iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ptp: Fix pass zero to ERR_PTR() in ptp_clock_register

Browse Source 
[ Upstream commit aea0a897af9e44c258e8ab9296fad417f1bc063a ]

Fix smatch warning:

drivers/ptp/ptp_clock.c:298 ptp_clock_register() warn:
 passing zero to 'ERR_PTR'

'err' should be set while device_create_with_groups and
pps_register_source fails

Fixes: 85a66e550195 ("ptp: create "pins" together with the rest of attributes")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Acked-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
YueHaibing 2018-11-23 09:54:55 +08:00 committed by Greg Kroah-Hartman
parent 2dbfc1cdb6
commit 3b07abf1ce
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/ptp/ptp_clock.c
View File

@ -253,8 +253,10 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
ptp->dev = device_create_with_groups(ptp_class, parent, ptp->devid, ptp->dev = device_create_with_groups(ptp_class, parent, ptp->devid,
ptp, ptp->pin_attr_groups, ptp, ptp->pin_attr_groups,
"ptp%d", ptp->index); "ptp%d", ptp->index);
if (IS_ERR(ptp->dev)) if (IS_ERR(ptp->dev)) {
err = PTR_ERR(ptp->dev);
goto no_device; goto no_device;
}
/* Register a new PPS source. */ /* Register a new PPS source. */
if (info->pps) { if (info->pps) {
@ -265,6 +267,7 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
pps.owner = info->owner; pps.owner = info->owner;
ptp->pps_source = pps_register_source(&pps, PTP_PPS_DEFAULTS); ptp->pps_source = pps_register_source(&pps, PTP_PPS_DEFAULTS);
if (!ptp->pps_source) { if (!ptp->pps_source) {
err = -EINVAL;
pr_err("failed to register pps source\n"); pr_err("failed to register pps source\n");
goto no_pps; goto no_pps;
} }