Skip to content

Commit 814c2ba

Browse files
jhovoldgregkh
authored andcommitted
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: 388bc26 ("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>
1 parent a52e101 commit 814c2ba

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

drivers/tty/serial/omap-serial.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1712,7 +1712,8 @@ static int serial_omap_probe(struct platform_device *pdev)
17121712
return 0;
17131713

17141714
err_add_port:
1715-
pm_runtime_put(&pdev->dev);
1715+
pm_runtime_dont_use_autosuspend(&pdev->dev);
1716+
pm_runtime_put_sync(&pdev->dev);
17161717
pm_runtime_disable(&pdev->dev);
17171718
pm_qos_remove_request(&up->pm_qos_request);
17181719
device_init_wakeup(up->dev, false);

0 commit comments

Comments
 (0)