| Message ID | 1397494975-22489-1-git-send-email-geert@linux-m68k.org (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
On ?, 2014-04-14 at 19:02 +0200, Geert Uytterhoeven wrote: > From: Geert Uytterhoeven <geert+renesas@glider.be> > > There's no need for this to be synchronous > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> applied. thanks, rui > --- > drivers/thermal/rcar_thermal.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c > index 5a37940b02c9..a8ed0e0265ae 100644 > --- a/drivers/thermal/rcar_thermal.c > +++ b/drivers/thermal/rcar_thermal.c > @@ -470,7 +470,7 @@ error_unregister: > rcar_thermal_irq_disable(priv); > } > > - pm_runtime_put_sync(dev); > + pm_runtime_put(dev); > pm_runtime_disable(dev); > > return ret; > @@ -488,7 +488,7 @@ static int rcar_thermal_remove(struct platform_device *pdev) > rcar_thermal_irq_disable(priv); > } > > - pm_runtime_put_sync(dev); > + pm_runtime_put(dev); > pm_runtime_disable(dev); > > return 0; -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c index 5a37940b02c9..a8ed0e0265ae 100644 --- a/drivers/thermal/rcar_thermal.c +++ b/drivers/thermal/rcar_thermal.c @@ -470,7 +470,7 @@ error_unregister: rcar_thermal_irq_disable(priv); } - pm_runtime_put_sync(dev); + pm_runtime_put(dev); pm_runtime_disable(dev); return ret; @@ -488,7 +488,7 @@ static int rcar_thermal_remove(struct platform_device *pdev) rcar_thermal_irq_disable(priv); } - pm_runtime_put_sync(dev); + pm_runtime_put(dev); pm_runtime_disable(dev); return 0;