| commit | d2fe67087fe9f61c86332743de6d7a214f1e053a | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Mon Sep 23 09:33:17 2013 -0700 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Mon Sep 23 09:33:16 2013 -0700 |
| tree | 4c0a40f7f60d974c020ae863ab44d39613084b91 | |
| parent | 80297a4df5842224693a3302dbbedcf61c12ad45 [diff] | |
| parent | eeaaaba69533428967c45cd190caa2bfb7283c06 [diff] |
Merge "ASoC: wcd9xxx: check NULL for mbhc->resmgr->reg_addr"
diff --git a/sound/soc/codecs/wcd9xxx-mbhc.c b/sound/soc/codecs/wcd9xxx-mbhc.c index 4e95fa9..a9e0c43 100644 --- a/sound/soc/codecs/wcd9xxx-mbhc.c +++ b/sound/soc/codecs/wcd9xxx-mbhc.c
@@ -1900,7 +1900,7 @@ 0); } - if (mbhc->resmgr->reg_addr->micb_4_mbhc) + if (mbhc->resmgr->reg_addr && mbhc->resmgr->reg_addr->micb_4_mbhc) snd_soc_update_bits(codec, mbhc->resmgr->reg_addr->micb_4_mbhc, 0x3, mbhc->mbhc_cfg->micbias);