diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-16 09:14:35 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-16 09:14:35 -0400 |
| commit | 8d98f2246d7c622198ae0b8ca66f1c82b8a25377 (patch) | |
| tree | 6e1dd0347aadc121f6933f070bffd34bb3b33f70 /sound/soc/pxa | |
| parent | 3ba191ce051a32b20757f063120496e860ea8f9d (diff) | |
| parent | 002fbad829883a3ad9b185077f9e54c37dc7502d (diff) | |
Merge branch 'for-2.6.30' into for-2.6.31
Diffstat (limited to 'sound/soc/pxa')
| -rw-r--r-- | sound/soc/pxa/pxa-ssp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index 6768e4ecfd75..487079550e71 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c | |||
| @@ -815,6 +815,7 @@ static int pxa_ssp_probe(struct platform_device *pdev, | |||
| 815 | goto err_priv; | 815 | goto err_priv; |
| 816 | } | 816 | } |
| 817 | 817 | ||
| 818 | priv->dai_fmt = (unsigned int) -1; | ||
| 818 | dai->private_data = priv; | 819 | dai->private_data = priv; |
| 819 | 820 | ||
| 820 | return 0; | 821 | return 0; |