lkml.org 
[lkml]   [2021]   [Sep]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.14 204/252] mmc: sdhci-of-arasan: Check return value of non-void funtions
    Date
    From: Manish Narani <manish.narani@xilinx.com>

    [ Upstream commit 66bad6ed2204fdb78a0a8fb89d824397106a5471 ]

    At a couple of places, the return values of the non-void functions were
    not getting checked. This was reported by the coverity tool. Modify the
    code to check the return values of the same.

    Addresses-Coverity: ("check_return")
    Signed-off-by: Manish Narani <manish.narani@xilinx.com>
    Acked-by: Adrian Hunter <adrian.hunter@intel.com>
    Link: https://lore.kernel.org/r/1623753837-21035-5-git-send-email-manish.narani@xilinx.com
    Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/mmc/host/sdhci-of-arasan.c | 18 +++++++++++++++---
    1 file changed, 15 insertions(+), 3 deletions(-)

    diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c
    index 03c80c9bb7e3..b6902447d779 100644
    --- a/drivers/mmc/host/sdhci-of-arasan.c
    +++ b/drivers/mmc/host/sdhci-of-arasan.c
    @@ -273,7 +273,12 @@ static void sdhci_arasan_set_clock(struct sdhci_host *host, unsigned int clock)
    * through low speeds without power cycling.
    */
    sdhci_set_clock(host, host->max_clk);
    - phy_power_on(sdhci_arasan->phy);
    + if (phy_power_on(sdhci_arasan->phy)) {
    + pr_err("%s: Cannot power on phy.\n",
    + mmc_hostname(host->mmc));
    + return;
    + }
    +
    sdhci_arasan->is_phy_on = true;

    /*
    @@ -323,7 +328,12 @@ static void sdhci_arasan_set_clock(struct sdhci_host *host, unsigned int clock)
    msleep(20);

    if (ctrl_phy) {
    - phy_power_on(sdhci_arasan->phy);
    + if (phy_power_on(sdhci_arasan->phy)) {
    + pr_err("%s: Cannot power on phy.\n",
    + mmc_hostname(host->mmc));
    + return;
    + }
    +
    sdhci_arasan->is_phy_on = true;
    }
    }
    @@ -479,7 +489,9 @@ static int sdhci_arasan_suspend(struct device *dev)
    ret = phy_power_off(sdhci_arasan->phy);
    if (ret) {
    dev_err(dev, "Cannot power off phy.\n");
    - sdhci_resume_host(host);
    + if (sdhci_resume_host(host))
    + dev_err(dev, "Cannot resume host.\n");
    +
    return ret;
    }
    sdhci_arasan->is_phy_on = false;
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-09-09 14:02    [W:4.107 / U:0.428 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site