]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
soundwire: qcom: return error when pm_runtime_get_sync fails
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Tue, 26 Apr 2022 23:56:19 +0000 (07:56 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 14 Jun 2022 16:44:50 +0000 (18:44 +0200)
[ Upstream commit f6ee6c8499226eb158ca30457d346511f5e329ce ]

For some reason there's a missing error return in two places.

Fixes: 74e79da9fd46a ("soundwire: qcom: add runtime pm support")
Fixes: 04d46a7b38375 ("soundwire: qcom: add in-band wake up interrupt support")
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20220426235623.4253-2-yung-chuan.liao@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/soundwire/qcom.c

index dd9f67f895b29547af9b7dc6c79fbd65b81995fb..b38525b35bec6b615f51a3d73a74611094bfb227 100644 (file)
@@ -516,6 +516,7 @@ static irqreturn_t qcom_swrm_wake_irq_handler(int irq, void *dev_id)
                                    "pm_runtime_get_sync failed in %s, ret %d\n",
                                    __func__, ret);
                pm_runtime_put_noidle(swrm->dev);
+               return ret;
        }
 
        if (swrm->wake_irq > 0) {
@@ -1258,6 +1259,7 @@ static int swrm_reg_show(struct seq_file *s_file, void *data)
                                    "pm_runtime_get_sync failed in %s, ret %d\n",
                                    __func__, ret);
                pm_runtime_put_noidle(swrm->dev);
+               return ret;
        }
 
        for (reg = 0; reg <= SWR_MSTR_MAX_REG_ADDR; reg += 4) {