summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-01-31 04:42:34 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-01-31 04:42:34 -0800
commitffbe81b2ede4d69f1d9bdfcb72c8c25e78de7fb2 (patch)
treeac908053c746a2c6f02b7204d0b3725ca4bdaddd /sound
parent22369c78bc34d29af496bbbe21e788f939b227b8 (diff)
parent8ef04e00f22743233e95c9f75b8d2f6ba5370024 (diff)
Merge "ASoC: msm: Fix invalid pdata access after kfree"
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/msm/sdm660-common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/msm/sdm660-common.c b/sound/soc/msm/sdm660-common.c
index 5dc5bf9d1b3c..50ffbb980256 100644
--- a/sound/soc/msm/sdm660-common.c
+++ b/sound/soc/msm/sdm660-common.c
@@ -2909,9 +2909,9 @@ err:
gpio_free(pdata->hph_en0_gpio);
pdata->hph_en0_gpio = 0;
}
- devm_kfree(&pdev->dev, pdata);
if (pdata->snd_card_val != INT_SND_CARD)
msm_ext_cdc_deinit(pdata);
+ devm_kfree(&pdev->dev, pdata);
return ret;
}