lkml.org 
[lkml]   [2019]   [Feb]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.20 070/352] ptp: Fix pass zero to ERR_PTR() in ptp_clock_register
    Date
    4.20-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ 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>
    ---
    drivers/ptp/ptp_clock.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c
    index 5419a89d300e..9b8aa6718ee7 100644
    --- a/drivers/ptp/ptp_clock.c
    +++ b/drivers/ptp/ptp_clock.c
    @@ -249,8 +249,10 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
    ptp->dev = device_create_with_groups(ptp_class, parent, ptp->devid,
    ptp, ptp->pin_attr_groups,
    "ptp%d", ptp->index);
    - if (IS_ERR(ptp->dev))
    + if (IS_ERR(ptp->dev)) {
    + err = PTR_ERR(ptp->dev);
    goto no_device;
    + }

    /* Register a new PPS source. */
    if (info->pps) {
    @@ -261,6 +263,7 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
    pps.owner = info->owner;
    ptp->pps_source = pps_register_source(&pps, PTP_PPS_DEFAULTS);
    if (!ptp->pps_source) {
    + err = -EINVAL;
    pr_err("failed to register pps source\n");
    goto no_pps;
    }
    --
    2.19.1


    \
     
     \ /
      Last update: 2019-02-11 15:24    [W:5.503 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site