| commit | 4cbf4097f22726c9ea85167bae1ac4757d3a978b | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Mon Apr 03 18:14:48 2017 -0700 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Mon Apr 03 18:14:48 2017 -0700 |
| tree | 7256c9b1004fb0a6d15b1abd30c645fc6dc2da46 | |
| parent | a261c673b120dcfe196c370cf1023fd6dd9a14de [diff] | |
| parent | 421cf77c376208fd8f20033a9a98a47cf9ba1465 [diff] |
Merge "ASoC: msm: Fix invalid pdata access after kfree" into msm-4.9
diff --git a/sound/soc/msm/sdm660-common.c b/sound/soc/msm/sdm660-common.c index 17361f1..23c0a6a 100644 --- a/sound/soc/msm/sdm660-common.c +++ b/sound/soc/msm/sdm660-common.c
@@ -2909,9 +2909,9 @@ 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; }