From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE501C43603 for ; Mon, 16 Dec 2019 18:49:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C2B2221835 for ; Mon, 16 Dec 2019 18:49:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576522161; bh=hlgJavf+bIDpCYxZ8/TP+6ibNvdneXkVfBByrcKCWN8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=t8rAbwP3g1lmWug84OUGiNiPLC0F1JoyEpKtUkqiXJbDw4ziAEPWDcAWJNQfJJg4j 1KZaVgNq56nEf+rOwEydsVJp9G38TDLMP3ru9eaR2OSEt7I/0vpTbXPkXL21EThetb APNMXDWcCeGozYjCuLmdU4K/PeMseHBohz3d48Vs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728898AbfLPStR (ORCPT ); Mon, 16 Dec 2019 13:49:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:47140 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727185AbfLPRxW (ORCPT ); Mon, 16 Dec 2019 12:53:22 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3481720733; Mon, 16 Dec 2019 17:53:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576518801; bh=hlgJavf+bIDpCYxZ8/TP+6ibNvdneXkVfBByrcKCWN8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W4ppP3kdtiBv+LH9HJoizm9B+uned+tTkyivBPlbvyQkcyQMgLXbGNMLofNLbgvuo tsvumvRJdEGb486F8CtXm/ryuz9fIL2eoXIVAfvEhP8dVElPgPopTQvrbaGRNQk/52 NfC/4aNfPoz0brxfw+4qiqIby4gVM8k+eK6sc+jU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stefan Agner , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Sasha Levin Subject: [PATCH 4.14 073/267] serial: imx: fix error handling in console_setup Date: Mon, 16 Dec 2019 18:46:39 +0100 Message-Id: <20191216174856.690213575@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191216174848.701533383@linuxfoundation.org> References: <20191216174848.701533383@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stefan Agner [ Upstream commit 63fd4b94b948c14eeb27a3bbf50ea0f7f0593bad ] The ipg clock only needs to be unprepared in case preparing per clock fails. The ipg clock has already disabled at the point. Fixes: 1cf93e0d5488 ("serial: imx: remove the uart_console() check") Signed-off-by: Stefan Agner Reviewed-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/tty/serial/imx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index 4e827e5a52a36..aae68230fb7b8 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -1956,7 +1956,7 @@ imx_console_setup(struct console *co, char *options) retval = clk_prepare(sport->clk_per); if (retval) - clk_disable_unprepare(sport->clk_ipg); + clk_unprepare(sport->clk_ipg); error_console: return retval; -- 2.20.1