diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-24 15:52:48 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-24 15:52:48 +0000 |
| commit | 133d2e6188de86df3ed84cd42ac66e9c5d328c04 (patch) | |
| tree | 7e8cef734d992c9e9733588e7679c77f66588f2d /sound/soc/codecs/cs4271.c | |
| parent | a49f0d1ea3ec94fc7cf33a7c36a16343b74bd565 (diff) | |
| parent | b8455c9f6f661fb9bcb791370478d6d15c9bf2b3 (diff) | |
| download | blackbird-op-linux-133d2e6188de86df3ed84cd42ac66e9c5d328c04.tar.gz blackbird-op-linux-133d2e6188de86df3ed84cd42ac66e9c5d328c04.zip | |
Merge branch 'asoc-fix-cs4271' into asoc-cs4271
Diffstat (limited to 'sound/soc/codecs/cs4271.c')
| -rw-r--r-- | sound/soc/codecs/cs4271.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/cs4271.c b/sound/soc/codecs/cs4271.c index 4f1127935fdf..ac8742a1f25a 100644 --- a/sound/soc/codecs/cs4271.c +++ b/sound/soc/codecs/cs4271.c @@ -474,16 +474,16 @@ static int cs4271_probe(struct snd_soc_codec *codec) struct cs4271_platform_data *cs4271plat = codec->dev->platform_data; int ret; int gpio_nreset = -EINVAL; - int amutec_eq_bmutec = 0; + bool amutec_eq_bmutec = false; #ifdef CONFIG_OF if (of_match_device(cs4271_dt_ids, codec->dev)) { gpio_nreset = of_get_named_gpio(codec->dev->of_node, "reset-gpio", 0); - if (!of_get_property(codec->dev->of_node, + if (of_get_property(codec->dev->of_node, "cirrus,amutec-eq-bmutec", NULL)) - amutec_eq_bmutec = 1; + amutec_eq_bmutec = true; } #endif |
