aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorPawel Moll <pawel.moll@arm.com>2013-04-03 08:26:27 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2013-04-09 06:09:09 -0400
commitb99877f3f7e1c8b7e6d133b56c8bcea4e2f7be80 (patch)
tree60ff7e881354150f2a9ed41a14d55fd18edfb22b /drivers/mfd
parentcaa62d642634e25cf4316b286abac54a70fd5a6a (diff)
mfd: vexpress: Give the "leds-gpio" device a real parent
The registration of the "leds-gpio" device was using "vexpress_sysreg_dev" as a parent before it was actually set to something different than NULL. Trivial fix by reordering the code. Reported-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Signed-off-by: Pawel Moll <pawel.moll@arm.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/vexpress-sysreg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/vexpress-sysreg.c b/drivers/mfd/vexpress-sysreg.c
index bf75e967a1f3..96a020b1dcd1 100644
--- 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)
490 return err; 490 return err;
491 } 491 }
492 492
493 vexpress_sysreg_dev = &pdev->dev;
494
493 platform_device_register_data(vexpress_sysreg_dev, "leds-gpio", 495 platform_device_register_data(vexpress_sysreg_dev, "leds-gpio",
494 PLATFORM_DEVID_AUTO, &vexpress_sysreg_leds_pdata, 496 PLATFORM_DEVID_AUTO, &vexpress_sysreg_leds_pdata,
495 sizeof(vexpress_sysreg_leds_pdata)); 497 sizeof(vexpress_sysreg_leds_pdata));
496 498
497 vexpress_sysreg_dev = &pdev->dev;
498
499 device_create_file(vexpress_sysreg_dev, &dev_attr_sys_id); 499 device_create_file(vexpress_sysreg_dev, &dev_attr_sys_id);
500 500
501 return 0; 501 return 0;