evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mmc: cmdq_hci: Fix pm ref count handling on error scenarios

Browse source 
Runtime pm get/put calls need to be called in pairs. Fix the
unpaired call of runtime pm put after input validation.

Change-Id: Ice2ba1e4d17ffde48b2f4d59801bb962f2e9aae7
Signed-off-by: Venkat Gopalakrishnan <venkatg@codeaurora.org>
This commit is contained in:
Venkat Gopalakrishnan 2015-08-24 14:36:59 -07:00 • committed by Subhash Jadavani
parent 35cf59211f
commit d397fec7fe
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/mmc/host/cmdq_hci.c
View file

@ -301,7 +301,7 @@ static int cmdq_enable(struct mmc_host *mmc)
pr_info("%s: %s: cq_host is already enabled\n", pr_info("%s: %s: cq_host is already enabled\n",
mmc_hostname(mmc), __func__); mmc_hostname(mmc), __func__);
WARN_ON(1); WARN_ON(1);
goto out; goto pm_ref_count;
} }
if (cq_host->quirks & CMDQ_QUIRK_NO_DCMD) if (cq_host->quirks & CMDQ_QUIRK_NO_DCMD)
@ -321,7 +321,7 @@ static int cmdq_enable(struct mmc_host *mmc)
!cq_host->trans_desc_base) { !cq_host->trans_desc_base) {
err = cmdq_host_alloc_tdl(cq_host); err = cmdq_host_alloc_tdl(cq_host);
if (err) if (err)
goto out; goto pm_ref_count;
} }
cmdq_writel(cq_host, lower_32_bits(cq_host->desc_dma_base), CQTDLBA); cmdq_writel(cq_host, lower_32_bits(cq_host->desc_dma_base), CQTDLBA);
@ -366,8 +366,10 @@ static int cmdq_enable(struct mmc_host *mmc)
if (cq_host->ops->enhanced_strobe_mask) if (cq_host->ops->enhanced_strobe_mask)
cq_host->ops->enhanced_strobe_mask(mmc, true); cq_host->ops->enhanced_strobe_mask(mmc, true);
out:
pm_ref_count:
cmdq_runtime_pm_put(cq_host); cmdq_runtime_pm_put(cq_host);
out:
return err; return err;
} }