diff options
| author | Matthias Kaehlcke <mka@chromium.org> | 2018-01-20 02:36:50 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-01-22 15:20:46 +0300 |
| commit | 35b84bf0614a7da98bfbbac70ed3d01c3b5b6c58 (patch) | |
| tree | 82ae84e6ebf99726291a5eff2b36fa0d6a2adab7 /sound | |
| parent | 7fb59e940f6225beed0b24cd09e9fad9aebb7565 (diff) | |
| download | linux-35b84bf0614a7da98bfbbac70ed3d01c3b5b6c58.tar.xz | |
ASoC: dmic: Fix check of return value from read of 'num-channels'
Commit 7fb59e940f62 ("ASoC: codecs: dmic: Make number of channels
configurable") introduces an optional property to the device tree
to specify the number of DMIC channels. dmic_codec_probe() uses
of_property_read_u32() to read the DT value, and expects a return
value of -ENOENT when the property does not exist. This expectation
is incorrect, the actual value returned in this case is -EINVAL (see
of_find_property_value_of_size(), which is called under the hood).
Check for -EINVAL instead.
Fixes: 7fb59e940f62 ("ASoC: codecs: dmic: Make number of channels configurable")
Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/dmic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/dmic.c b/sound/soc/codecs/dmic.c index c88f974ebe3e..cf83c423394d 100644 --- a/sound/soc/codecs/dmic.c +++ b/sound/soc/codecs/dmic.c @@ -113,7 +113,7 @@ static int dmic_dev_probe(struct platform_device *pdev) if (pdev->dev.of_node) { err = of_property_read_u32(pdev->dev.of_node, "num-channels", &chans); - if (err && (err != -ENOENT)) + if (err && (err != -EINVAL)) return err; if (!err) { |