Commit 17ffba6a authored Jul 07, 2012 by NeilBrown Committed by Samuel Ortiz Jul 09, 2012

mfd: Move twl-core device_init_wakeup to after platform_device_add



device_init_wakeup uses the dev_name() of the device to set the
name of the wakeup_source which appears in
/sys/kernel/debug/wakeup_sources.

For a platform device, that name is not set until platform_device_add
calls dev_set_name.

So the call to device_init_wakeup() must be after the call to
platform_device_add().
Making this change causes correct names to appear in the
wakeup_sources file.

Signed-off-by: NeilBrown <neilb@suse.de>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

parent 5500e396

drivers/mfd/twl-core.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -568,7 +568,6 @@ add_numbered_child(unsigned chip, const char *name, int num,
		goto err;
		}

		device_init_wakeup(&pdev->dev, can_wakeup);
		pdev->dev.parent = &twl->client->dev;

		if (pdata) {
		@@ -593,6 +592,8 @@ add_numbered_child(unsigned chip, const char *name, int num,
		}

		status = platform_device_add(pdev);
		if (status == 0)
		device_init_wakeup(&pdev->dev, can_wakeup);

		err:
		if (status < 0) {

Admin message