Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

[karo-tx-linux.git] / drivers / soc / samsung / exynos-pmu.c

diff --git a/drivers/soc/samsung/exynos-pmu.c b/drivers/soc/samsung/exynos-pmu.c
index 813df6e7292d7ac4cbf25d33d0e5e166dce6e14b..56d9244ff98147d056fc094fb6dcee6ad7f6830e 100644 (file)
--- a/drivers/soc/samsung/exynos-pmu.c
+++ b/drivers/soc/samsung/exynos-pmu.c
@@ -44,7 +44,7 @@ void exynos_sys_powerdown_conf(enum sys_powerdown mode)
        unsigned int i;
        const struct exynos_pmu_data *pmu_data;
 
-       if (!pmu_context)
+       if (!pmu_context || !pmu_context->pmu_data)
                return;
 
        pmu_data = pmu_context->pmu_data;
@@ -90,6 +90,8 @@ static const struct of_device_id exynos_pmu_of_device_ids[] = {
        }, {
                .compatible = "samsung,exynos5420-pmu",
                .data = &exynos5420_pmu_data,
+       }, {
+               .compatible = "samsung,exynos5433-pmu",
        },
        { /*sentinel*/ },
 };
@@ -122,7 +124,7 @@ static int exynos_pmu_probe(struct platform_device *pdev)
        pmu_context->dev = dev;
        pmu_context->pmu_data = of_device_get_match_data(dev);
 
-       if (pmu_context->pmu_data->pmu_init)
+       if (pmu_context->pmu_data && pmu_context->pmu_data->pmu_init)
                pmu_context->pmu_data->pmu_init();
 
        platform_set_drvdata(pdev, pmu_context);