Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 132925
b: refs/heads/master
c: 10d9e3d
h: refs/heads/master
i:
  132923: 83eb0bf
v: v3
  • Loading branch information
Joonyoung Shim authored and Mark Brown committed Mar 16, 2009
1 parent 40015ea commit aa0c947
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 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: 26ade896b6ba3fd017ef4a26e71e7b7569222cb6
refs/heads/master: 10d9e3d99ee8332bb73a3d7f12a8cd8ffab8b136
12 changes: 7 additions & 5 deletions trunk/sound/soc/codecs/twl4030.c
Original file line number Diff line number Diff line change
Expand Up @@ -1383,6 +1383,12 @@ static int twl4030_set_dai_fmt(struct snd_soc_dai *codec_dai,
#define TWL4030_RATES (SNDRV_PCM_RATE_8000_48000)
#define TWL4030_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FORMAT_S24_LE)

static struct snd_soc_dai_ops twl4030_dai_ops = {
.hw_params = twl4030_hw_params,
.set_sysclk = twl4030_set_dai_sysclk,
.set_fmt = twl4030_set_dai_fmt,
};

struct snd_soc_dai twl4030_dai = {
.name = "twl4030",
.playback = {
Expand All @@ -1397,11 +1403,7 @@ struct snd_soc_dai twl4030_dai = {
.channels_max = 2,
.rates = TWL4030_RATES,
.formats = TWL4030_FORMATS,},
.ops = {
.hw_params = twl4030_hw_params,
.set_sysclk = twl4030_set_dai_sysclk,
.set_fmt = twl4030_set_dai_fmt,
}
.ops = &twl4030_dai_ops,
};
EXPORT_SYMBOL_GPL(twl4030_dai);

Expand Down

0 comments on commit aa0c947

Please sign in to comment.