From 2b18a0eb107677d44fb28d46532cb8ac796f1d93 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Tue, 27 Oct 2015 15:27:26 +0100 Subject: [PATCH] staging: board: Set PM domain before probe PM domains shouldn't be modified after a device is probed, so set it before device registration to be sure of that. In the future the PM domain pointer will be set through a setter that will WARN if the device has been probed already. Signed-off-by: Tomeu Vizoso Tested-by: Geert Uytterhoeven Signed-off-by: Greg Kroah-Hartman --- drivers/staging/board/board.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/board/board.c b/drivers/staging/board/board.c index 3eb5eb8f069c..965afc79aadd 100644 --- a/drivers/staging/board/board.c +++ b/drivers/staging/board/board.c @@ -187,6 +187,9 @@ int __init board_staging_register_device(const struct board_staging_dev *dev) for (i = 0; i < dev->nclocks; i++) board_staging_register_clock(&dev->clocks[i]); + if (dev->domain) + board_staging_add_dev_domain(pdev, dev->domain); + error = platform_device_register(pdev); if (error) { pr_err("Failed to register device %s (%d)\n", pdev->name, @@ -194,9 +197,6 @@ int __init board_staging_register_device(const struct board_staging_dev *dev) return error; } - if (dev->domain) - board_staging_add_dev_domain(pdev, dev->domain); - return error; } -- 2.20.1