summaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses
diff options
context:
space:
mode:
authorFelipe Balbi2015-07-13 22:38:04 +0200
committerWolfram Sang2015-08-10 08:37:28 +0200
commit1c4828f916ffd5b7cc4d57d832cce615475b36da (patch)
tree80956a38a1f3cede378fd13c8cb1bd91b4481cd9 /drivers/i2c/busses
parenti2c: omap: abolish variable name confusion (diff)
downloadkernel-qcow2-linux-1c4828f916ffd5b7cc4d57d832cce615475b36da.tar.gz
kernel-qcow2-linux-1c4828f916ffd5b7cc4d57d832cce615475b36da.tar.xz
kernel-qcow2-linux-1c4828f916ffd5b7cc4d57d832cce615475b36da.zip
i2c: omap: on ->remove() call pm_runtime_put_sync()
we're about to remove the module, so we can't really schedule a PM transition in the future, we must wait for it to finish. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c/busses')
-rw-r--r--drivers/i2c/busses/i2c-omap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index e359ad39753b..afc3bfca0b6c 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -1468,7 +1468,7 @@ static int omap_i2c_remove(struct platform_device *pdev)
return ret;
omap_i2c_write_reg(omap, OMAP_I2C_CON_REG, 0);
- pm_runtime_put(&pdev->dev);
+ pm_runtime_put_sync(&pdev->dev);
pm_runtime_disable(&pdev->dev);
return 0;
}