diff options
| author | Johan Hovold <johan@kernel.org> | 2017-04-10 05:21:39 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-05-20 08:28:41 -0400 |
| commit | e38a4c3b0b4a3df1abbe7ae9c175eed62286f963 (patch) | |
| tree | 5975e1de782c279a94d719839551ad25c4f079c4 /drivers/tty | |
| parent | f8d2751b0012367c757b43b8e07ab81c051aba5a (diff) | |
serial: omap: suspend device on probe errors
commit 77e6fe7fd2b7cba0bf2f2dc8cde51d7b9a35bf74 upstream.
Make sure to actually suspend the device before returning after a failed
(or deferred) probe.
Note that autosuspend must be disabled before runtime pm is disabled in
order to balance the usage count due to a negative autosuspend delay as
well as to make the final put suspend the device synchronously.
Fixes: 388bc2622680 ("omap-serial: Fix the error handling in the omap_serial probe")
Cc: Shubhrajyoti D <shubhrajyoti@ti.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/omap-serial.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index d31f8af3aacf..44e5b5bf713b 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c | |||
| @@ -1712,7 +1712,8 @@ static int serial_omap_probe(struct platform_device *pdev) | |||
| 1712 | return 0; | 1712 | return 0; |
| 1713 | 1713 | ||
| 1714 | err_add_port: | 1714 | err_add_port: |
| 1715 | pm_runtime_put(&pdev->dev); | 1715 | pm_runtime_dont_use_autosuspend(&pdev->dev); |
| 1716 | pm_runtime_put_sync(&pdev->dev); | ||
| 1716 | pm_runtime_disable(&pdev->dev); | 1717 | pm_runtime_disable(&pdev->dev); |
| 1717 | pm_qos_remove_request(&up->pm_qos_request); | 1718 | pm_qos_remove_request(&up->pm_qos_request); |
| 1718 | device_init_wakeup(up->dev, false); | 1719 | device_init_wakeup(up->dev, false); |