Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 293205
b: refs/heads/master
c: 8819f65
h: refs/heads/master
i:
  293203: 8f0d1f5
v: v3
  • Loading branch information
Peter Ujfalusi authored and Mark Brown committed Jan 20, 2012
1 parent e9a0134 commit 3dbdd83
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8d725b2bcb82ff46236bf745c9ab7cc4dde74699
refs/heads/master: 8819f65ceca118561c9d59a04cfd91625c74a262
7 changes: 4 additions & 3 deletions trunk/sound/soc/codecs/twl4030.c
Original file line number Diff line number Diff line change
Expand Up @@ -1689,7 +1689,6 @@ static int twl4030_startup(struct snd_pcm_substream *substream,
struct snd_soc_codec *codec = rtd->codec;
struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);

snd_pcm_hw_constraint_msbits(substream->runtime, 0, 32, 24);
if (twl4030->master_substream) {
twl4030->slave_substream = substream;
/* The DAI has one configuration for playback and capture, so
Expand Down Expand Up @@ -2175,13 +2174,15 @@ static struct snd_soc_dai_driver twl4030_dai[] = {
.channels_min = 2,
.channels_max = 4,
.rates = TWL4030_RATES | SNDRV_PCM_RATE_96000,
.formats = TWL4030_FORMATS,},
.formats = TWL4030_FORMATS,
.sig_bits = 24,},
.capture = {
.stream_name = "Capture",
.channels_min = 2,
.channels_max = 4,
.rates = TWL4030_RATES,
.formats = TWL4030_FORMATS,},
.formats = TWL4030_FORMATS,
.sig_bits = 24,},
.ops = &twl4030_dai_hifi_ops,
},
{
Expand Down

0 comments on commit 3dbdd83

Please sign in to comment.