git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.0' into for-3.1
[pandora-kernel.git]
/
sound
/
soc
/
atmel
/
atmel_ssc_dai.c
diff --git
a/sound/soc/atmel/atmel_ssc_dai.c
b/sound/soc/atmel/atmel_ssc_dai.c
index
a7a7bbc
..
f53dc09
100644
(file)
--- a/
sound/soc/atmel/atmel_ssc_dai.c
+++ b/
sound/soc/atmel/atmel_ssc_dai.c
@@
-846,9
+846,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)