diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-12-30 16:40:46 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-12-30 16:40:46 +0100 |
| commit | 614acf93dceb8e9d73370f7c9b19f64c8cf17496 (patch) | |
| tree | 0a9528c16e73bd5026fdc73a8602d0d645fe109a /sound/soc/soc-pcm.c | |
| parent | 6a8484b63c421d3a69e6f560565d64e1de33d23d (diff) | |
| parent | 0e2a37513a1fafa0b9829e992633a80861c3b4b5 (diff) | |
| download | linux-stable-614acf93dceb8e9d73370f7c9b19f64c8cf17496.tar.gz linux-stable-614acf93dceb8e9d73370f7c9b19f64c8cf17496.tar.bz2 linux-stable-614acf93dceb8e9d73370f7c9b19f64c8cf17496.zip | |
Merge branch 'topic/msbits' into for-next
Diffstat (limited to 'sound/soc/soc-pcm.c')
| -rw-r--r-- | sound/soc/soc-pcm.c | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 0ae0e2a9eed7..d6e8d6b3fccd 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -301,15 +301,6 @@ static bool soc_pcm_has_symmetry(struct snd_pcm_substream *substream) return symmetry; } -/* - * List of sample sizes that might go over the bus for parameter - * application. There ought to be a wildcard sample size for things - * like the DAC/ADC resolution to use but there isn't right now. - */ -static int sample_sizes[] = { - 24, 32, -}; - static void soc_pcm_set_msb(struct snd_pcm_substream *substream, int bits) { struct snd_soc_pcm_runtime *rtd = substream->private_data; @@ -318,17 +309,10 @@ static void soc_pcm_set_msb(struct snd_pcm_substream *substream, int bits) if (!bits) return; - for (i = 0; i < ARRAY_SIZE(sample_sizes); i++) { - if (bits >= sample_sizes[i]) - continue; - - ret = snd_pcm_hw_constraint_msbits(substream->runtime, 0, - sample_sizes[i], bits); - if (ret != 0) - dev_warn(rtd->dev, - "ASoC: Failed to set MSB %d/%d: %d\n", - bits, sample_sizes[i], ret); - } + ret = snd_pcm_hw_constraint_msbits(substream->runtime, 0, 0, bits); + if (ret != 0) + dev_warn(rtd->dev, "ASoC: Failed to set MSB %d: %d\n", + bits, ret); } static void soc_pcm_apply_msb(struct snd_pcm_substream *substream) |