diff options
| author | David S. Miller <davem@davemloft.net> | 2011-06-20 22:29:08 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-20 22:29:08 -0700 |
| commit | 9f6ec8d697c08963d83880ccd35c13c5ace716ea (patch) | |
| tree | ad8d93cf6fcdd09b86ade09f5fcbbc66cdb1cca2 /sound/soc/atmel/atmel_ssc_dai.c | |
| parent | 4aa3a715551c93eda32d79bd52042ce500bd5383 (diff) | |
| parent | 56299378726d5f2ba8d3c8cbbd13cb280ba45e4f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
drivers/net/wireless/rtlwifi/pci.c
net/netfilter/ipvs/ip_vs_core.c
Diffstat (limited to 'sound/soc/atmel/atmel_ssc_dai.c')
| -rw-r--r-- | sound/soc/atmel/atmel_ssc_dai.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index 7fbfa051f6e1..eda955b15834 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -848,9 +848,10 @@ int atmel_ssc_set_audio(int ssc_id) if (IS_ERR(ssc)) pr_warn("Unable to parent ASoC SSC DAI on SSC: %ld\n", PTR_ERR(ssc)); - else + else { ssc_pdev->dev.parent = &(ssc->pdev->dev); - ssc_free(ssc); + ssc_free(ssc); + } ret = platform_device_add(ssc_pdev); if (ret < 0) |