Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / drivers / mfd / ti_am335x_tscadc.c

diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c
index fd111296b959255c5a7fdeb61fcd2649594ebbd7..926c289cb04098f0df889bb13a730738b8381d0f 100644 (file)
--- a/drivers/mfd/ti_am335x_tscadc.c
+++ b/drivers/mfd/ti_am335x_tscadc.c
@@ -182,11 +182,11 @@ static    int ti_tscadc_probe(struct platform_device *pdev)
                tscadc->irq = err;
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       tscadc->tscadc_phys_base = res->start;
        tscadc->tscadc_base = devm_ioremap_resource(&pdev->dev, res);
        if (IS_ERR(tscadc->tscadc_base))
                return PTR_ERR(tscadc->tscadc_base);
 
+       tscadc->tscadc_phys_base = res->start;
        tscadc->regmap = devm_regmap_init_mmio(&pdev->dev,
                        tscadc->tscadc_base, &tscadc_regmap_config);
        if (IS_ERR(tscadc->regmap)) {