lkml.org 
[lkml]   [2022]   [Aug]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 09/32] scsi: ufs: host: Hold reference returned by of_parse_phandle()
    Date
    From: Liang He <windhl@126.com>

    commit a3435afba87dc6cd83f5595e7607f3c40f93ef01 upstream.

    In ufshcd_populate_vreg(), we should hold the reference returned by
    of_parse_phandle() and then use it to call of_node_put() for refcount
    balance.

    Link: https://lore.kernel.org/r/20220719071529.1081166-1-windhl@126.com
    Fixes: aa4976130934 ("ufs: Add regulator enable support")
    Reviewed-by: Bart Van Assche <bvanassche@acm.org>
    Signed-off-by: Liang He <windhl@126.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/scsi/ufs/ufshcd-pltfrm.c | 15 +++++++++++++--
    1 file changed, 13 insertions(+), 2 deletions(-)

    --- a/drivers/scsi/ufs/ufshcd-pltfrm.c
    +++ b/drivers/scsi/ufs/ufshcd-pltfrm.c
    @@ -124,9 +124,20 @@ out:
    return ret;
    }

    +static bool phandle_exists(const struct device_node *np,
    + const char *phandle_name, int index)
    +{
    + struct device_node *parse_np = of_parse_phandle(np, phandle_name, index);
    +
    + if (parse_np)
    + of_node_put(parse_np);
    +
    + return parse_np != NULL;
    +}
    +
    #define MAX_PROP_SIZE 32
    static int ufshcd_populate_vreg(struct device *dev, const char *name,
    - struct ufs_vreg **out_vreg)
    + struct ufs_vreg **out_vreg)
    {
    int ret = 0;
    char prop_name[MAX_PROP_SIZE];
    @@ -139,7 +150,7 @@ static int ufshcd_populate_vreg(struct d
    }

    snprintf(prop_name, MAX_PROP_SIZE, "%s-supply", name);
    - if (!of_parse_phandle(np, prop_name, 0)) {
    + if (!phandle_exists(np, prop_name, 0)) {
    dev_info(dev, "%s: Unable to find %s regulator, assuming enabled\n",
    __func__, prop_name);
    goto out;

    \
     
     \ /
      Last update: 2022-08-09 20:06    [W:2.491 / U:0.220 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site