1 files changed, 7 insertions, 3 deletions

diff --git a/drivers/mfd/mc13xxx-core.c b/drivers/mfd/mc13xxx-core.c
index 06e64b6fcb89..0c6c21c5b1a8 100644
--- a/drivers/mfd/mc13xxx-core.c
+++ b/drivers/mfd/mc13xxx-core.c
@@ -673,9 +673,13 @@ int mc13xxx_common_init(struct device *dev)
         if (mc13xxx->flags & MC13XXX_USE_ADC)
                 mc13xxx_add_subdevice(mc13xxx, "%s-adc");
 
-        if (mc13xxx->flags & MC13XXX_USE_CODEC)
-                mc13xxx_add_subdevice_pdata(mc13xxx, "%s-codec",
-                                        pdata->codec, sizeof(*pdata->codec));
+        if (mc13xxx->flags & MC13XXX_USE_CODEC) {
+                if (pdata)
+                        mc13xxx_add_subdevice_pdata(mc13xxx, "%s-codec",
+                                pdata->codec, sizeof(*pdata->codec));
+                else
+                        mc13xxx_add_subdevice(mc13xxx, "%s-codec");
+        }
 
         if (mc13xxx->flags & MC13XXX_USE_RTC)
                 mc13xxx_add_subdevice(mc13xxx, "%s-rtc");