From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753233AbdDJJ0Y (ORCPT ); Mon, 10 Apr 2017 05:26:24 -0400 Received: from mail-lf0-f66.google.com ([209.85.215.66]:33557 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753017AbdDJJZG (ORCPT ); Mon, 10 Apr 2017 05:25:06 -0400 From: Johan Hovold To: Greg Kroah-Hartman Cc: Jiri Slaby , linux-serial@vger.kernel.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , Shubhrajyoti D , Tony Lindgren Subject: [PATCH 2/2] serial: omap: suspend device on probe errors Date: Mon, 10 Apr 2017 11:21:39 +0200 Message-Id: <20170410092139.11441-2-johan@kernel.org> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170410092139.11441-1-johan@kernel.org> References: <20170410092139.11441-1-johan@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: Tony Lindgren Signed-off-by: Johan Hovold --- drivers/tty/serial/omap-serial.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index 8c2086e14b51..e4210b9ad0d3 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -1767,7 +1767,8 @@ static int serial_omap_probe(struct platform_device *pdev) 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); -- 2.12.2