diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-31 23:51:22 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-31 23:51:22 +0100 |
| commit | f3124ba519b42426525585f50dbde3235b1fb89a (patch) | |
| tree | 5343d6c4ea4e88d6b6a8af75d701553d258ea334 /sound | |
| parent | 7dcba49cf6c1fd2d6ec1bead821fdd85e84bdc1f (diff) | |
| parent | a2e124daef622d8745510ab24b023027dcdc9146 (diff) | |
Merge tag 'v3.10.35' into linux-linaro-lsk
This is the 3.10.35 stable release
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/core/compress_offload.c | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/max98090.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index 19799931c51..3fdf998ad05 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -133,7 +133,7 @@ static int snd_compr_open(struct inode *inode, struct file *f) kfree(data); } snd_card_unref(compr->card); - return 0; + return ret; } static int snd_compr_free(struct inode *inode, struct file *f) diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c index 819c90fe021..4fdcc1cefc2 100644 --- a/sound/soc/codecs/max98090.c +++ b/sound/soc/codecs/max98090.c @@ -336,6 +336,7 @@ static bool max98090_readable_register(struct device *dev, unsigned int reg) case M98090_REG_RECORD_TDM_SLOT: case M98090_REG_SAMPLE_RATE: case M98090_REG_DMIC34_BIQUAD_BASE ... M98090_REG_DMIC34_BIQUAD_BASE + 0x0E: + case M98090_REG_REVISION_ID: return true; default: return false; |