aboutsummaryrefslogtreecommitdiff
path: root/sound/soc/pxa
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-04-19 11:39:38 +0200
committerTakashi Iwai <tiwai@suse.de>2009-04-19 11:39:38 +0200
commit1e2ae4ddd373af6fa3ea2483d7fc4a08c7f54395 (patch)
treea1d78a51725dbcf2d8ffb38873c0825f48944015 /sound/soc/pxa
parentff54250a0ebab7f90a5f848a0ba63f999830c872 (diff)
parent002fbad829883a3ad9b185077f9e54c37dc7502d (diff)
Merge branch 'fix/asoc' into for-linus
* fix/asoc: ASoC: OMAP: Fix FS polarity in OSK5912 machine driver ASoC: OMAP: Fix DSP_B format in OMAP McBSP DAI driver ASoC: Fix include build error in s3c2412-i2s.c ASoC: Fix s3c-i2s-v2.c snd_soc_dai changes ASoC: s3c-i2s-v2.c fix for s3c_i2sv2_iis_calc_rate ASoC: Fix jive_wm8750.c build problems ASoC: pxa-ssp: allow setting of dai format 0
Diffstat (limited to 'sound/soc/pxa')
-rw-r--r--sound/soc/pxa/pxa-ssp.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index 308a657928d..de2254475d5 100644
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -806,6 +806,7 @@ static int pxa_ssp_probe(struct platform_device *pdev,
goto err_priv;
}
+ priv->dai_fmt = (unsigned int) -1;
dai->private_data = priv;
return 0;