Skip to contentSkip to conversation

Patch "serial: omap: suspend device on probe errors" has been added to the 4.10-stable tree

PATCH [email protected] 1 participant 1 message May 18, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

serial: omap: suspend device on probe errors

to the 4.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
serial-omap-suspend-device-on-probe-errors.patch
and it can be found in the queue-4.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 77e6fe7fd2b7cba0bf2f2dc8cde51d7b9a35bf74 Mon Sep 17 00:00:00 2001

From: Johan Hovold <[email protected]>
Date: Mon, 10 Apr 2017 11:21:39 +0200
Subject: serial: omap: suspend device on probe errors

From: Johan Hovold <[email protected]>

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 <[email protected]>
---
 drivers/tty/serial/omap-serial.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/tty/serial/omap-serial.c +2 -1
@@ -1712,7 +1712,8 @@ static int serial_omap_probe(struct plat
 	return 0;
 
 err_add_port:
-	pm_runtime_put(&pdev->dev);
+	pm_runtime_dont_use_autosuspend(&pdev->dev);
+	pm_runtime_put_sync(&pdev->dev);
 	pm_runtime_disable(&pdev->dev);
 	pm_qos_remove_request(&up->pm_qos_request);
 	device_init_wakeup(up->dev, false);

Patches currently in stable-queue which might be from [email protected] are

queue-4.10/usb-serial-ftdi_sio-add-device-id-for-microsemi-arrow-sf2plus-dev-kit.patch queue-4.10/bluetooth-hci_bcm-add-missing-tty-device-sanity-check.patch queue-4.10/bluetooth-hci_intel-add-missing-tty-device-sanity-check.patch queue-4.10/serial-omap-fix-runtime-pm-handling-on-unbind.patch queue-4.10/serial-omap-suspend-device-on-probe-errors.patch queue-4.10/staging-gdm724x-gdm_mux-fix-use-after-free-on-module-unload.patch