summaryrefslogtreecommitdiffstats
path: root/sound/soc/atmel
diff options
context:
space:
mode:
authorOlof Johansson2013-12-26 19:31:33 +0100
committerOlof Johansson2013-12-26 19:31:33 +0100
commit509633c8366a0df239297c89689e87aaf6625781 (patch)
tree887622d77f0f2dc3886f52fdbe3f389df337dca1 /sound/soc/atmel
parentMerge tag 'samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
parentLinux 3.13-rc4 (diff)
downloadkernel-qcow2-linux-509633c8366a0df239297c89689e87aaf6625781.tar.gz
kernel-qcow2-linux-509633c8366a0df239297c89689e87aaf6625781.tar.xz
kernel-qcow2-linux-509633c8366a0df239297c89689e87aaf6625781.zip
Merge tag 'v3.13-rc4' into next/cleanup
Linux 3.13-rc4
Diffstat (limited to 'sound/soc/atmel')
-rw-r--r--sound/soc/atmel/sam9x5_wm8731.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/atmel/sam9x5_wm8731.c b/sound/soc/atmel/sam9x5_wm8731.c
index 992ae38d5a15..1b372283bd01 100644
--- a/sound/soc/atmel/sam9x5_wm8731.c
+++ b/sound/soc/atmel/sam9x5_wm8731.c
@@ -97,6 +97,8 @@ static int sam9x5_wm8731_driver_probe(struct platform_device *pdev)
goto out;
}
+ snd_soc_card_set_drvdata(card, priv);
+
card->dev = &pdev->dev;
card->owner = THIS_MODULE;
card->dai_link = dai;