Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[karo-tx-linux.git] / drivers / mfd / vexpress-sysreg.c

diff --git a/drivers/mfd/vexpress-sysreg.c b/drivers/mfd/vexpress-sysreg.c
index bf75e967a1f304f1b102d275464353c2067319b4..96a020b1dcd14a9321a1358a6dd420c1522e2f60 100644 (file)
--- a/drivers/mfd/vexpress-sysreg.c
+++ b/drivers/mfd/vexpress-sysreg.c
@@ -490,12 +490,12 @@ static int vexpress_sysreg_probe(struct platform_device *pdev)
                return err;
        }
 
+       vexpress_sysreg_dev = &pdev->dev;
+
        platform_device_register_data(vexpress_sysreg_dev, "leds-gpio",
                        PLATFORM_DEVID_AUTO, &vexpress_sysreg_leds_pdata,
                        sizeof(vexpress_sysreg_leds_pdata));
 
-       vexpress_sysreg_dev = &pdev->dev;
-
        device_create_file(vexpress_sysreg_dev, &dev_attr_sys_id);
 
        return 0;