diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-10 07:22:11 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-10 07:22:11 -0500 |
| commit | 587691ea396b4e3dc6ef2349e71f93292d55fc63 (patch) | |
| tree | 37b3eca0c3f50c25fd86c49d40aa664cfe20e34b /sound | |
| parent | a18a31a161d5bd4cc5786aa91a2847fbc1bde36e (diff) | |
| parent | b8455c9f6f661fb9bcb791370478d6d15c9bf2b3 (diff) | |
Merge remote-tracking branch 'asoc/fix/cs4271' into tmp
Diffstat (limited to 'sound')
| -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) | |||
| 474 | struct cs4271_platform_data *cs4271plat = codec->dev->platform_data; | 474 | struct cs4271_platform_data *cs4271plat = codec->dev->platform_data; |
| 475 | int ret; | 475 | int ret; |
| 476 | int gpio_nreset = -EINVAL; | 476 | int gpio_nreset = -EINVAL; |
| 477 | int amutec_eq_bmutec = 0; | 477 | bool amutec_eq_bmutec = false; |
| 478 | 478 | ||
| 479 | #ifdef CONFIG_OF | 479 | #ifdef CONFIG_OF |
| 480 | if (of_match_device(cs4271_dt_ids, codec->dev)) { | 480 | if (of_match_device(cs4271_dt_ids, codec->dev)) { |
| 481 | gpio_nreset = of_get_named_gpio(codec->dev->of_node, | 481 | gpio_nreset = of_get_named_gpio(codec->dev->of_node, |
| 482 | "reset-gpio", 0); | 482 | "reset-gpio", 0); |
| 483 | 483 | ||
| 484 | if (!of_get_property(codec->dev->of_node, | 484 | if (of_get_property(codec->dev->of_node, |
| 485 | "cirrus,amutec-eq-bmutec", NULL)) | 485 | "cirrus,amutec-eq-bmutec", NULL)) |
| 486 | amutec_eq_bmutec = 1; | 486 | amutec_eq_bmutec = true; |
| 487 | } | 487 | } |
| 488 | #endif | 488 | #endif |
| 489 | 489 | ||