Merge tag 'mfd-3.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

[linux-2.6-block.git] / drivers / mfd / mc13xxx-core.c

diff --git a/drivers/mfd/mc13xxx-core.c b/drivers/mfd/mc13xxx-core.c
index 13a32b79561515424005c80cdd7116197d8b231e..f0ea3b8b3e4ad979d5e1d5fe53bde83a7392dfd2 100644 (file)
--- a/drivers/mfd/mc13xxx-core.c
+++ b/drivers/mfd/mc13xxx-core.c
@@ -691,7 +691,8 @@ err_revision:
                mc13xxx_add_subdevice(mc13xxx, "%s-adc");
 
        if (mc13xxx->flags & MC13XXX_USE_CODEC)
-               mc13xxx_add_subdevice(mc13xxx, "%s-codec");
+               mc13xxx_add_subdevice_pdata(mc13xxx, "%s-codec",
+                                       pdata->codec, sizeof(*pdata->codec));
 
        if (mc13xxx->flags & MC13XXX_USE_RTC)
                mc13xxx_add_subdevice(mc13xxx, "%s-rtc");