Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp7022416imu; Wed, 14 Nov 2018 10:26:07 -0800 (PST) X-Google-Smtp-Source: AJdET5c9AtrAb6etPCCUOveJrGPa5QcsLZE6TqM2k3igdRFWi8yPIebJQTA6i1TO5q1Qf963fsHb X-Received: by 2002:a65:484c:: with SMTP id i12mr2730639pgs.309.1542219967678; Wed, 14 Nov 2018 10:26:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542219967; cv=none; d=google.com; s=arc-20160816; b=lvqu3fB7/dWbh8+6eEDam4ocQX4UigcAMl89VUsS19pUznSofZw+uqNAnprOyZp3uw jA81q+1j9TEs2NNcGjJAQgKek4XMD0Ooqtn9mtK2X19YjmB/4go/zs22Xh1k2Us27kiM cS/R//cK2Y+YUxpr+enReAVjKITC1wZ5hEU1x46UmTMV5ez3yVWXvZ5AN0gv0Eg7NfwY ilZerDagptlVpeNhQaALk/2L65tbK9i31RVuo/sgVvCAlFSNUI57BAfvZQMMrvETnVt7 jLGksynp24WKjL0VBfvha7jLaAiB2NgBrMyJWPPG0WWqwQJRsGULXDNxGOuIQLytYscj 0TCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=SwMlKre/tFmczZhs5V8n/suDDZFv4a74AdJARw1GjVo=; b=eOmjAHcaOIRv9y+7gNta/TatNrwsv/uxWWsGYtlmTYKhKM0yXmC2pzC4cBGwxJMbEN y6yIKEgksE81lheu6XUEvUQvGjq/TXsrM44pMIWMRmz+vjJia5JL4LEc0wG2siKHja2K o4U7EfevK0fNaRw57oB+W+kzvQ914OYiBH5myO+MggRxWbZVgLMVsVgVKHySsKCLzGay MB/89Yunj95YI1VAdfMhTktBw9O+QuoPJlhmUm/+POs/7I55ldTZCTp/Kd7ZwXBN/PSu 8BHa4XzKo9ZBDbPdoex8l2Oo2smtyi1q6tIBG3iM/nuA+/pFA7KBgeFe6QEL++lFe3m6 zaqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@agner.ch header.s=dkim header.b="am2cbIC/"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o14si4080807pgj.59.2018.11.14.10.25.49; Wed, 14 Nov 2018 10:26:07 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@agner.ch header.s=dkim header.b="am2cbIC/"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732367AbeKODx4 (ORCPT + 99 others); Wed, 14 Nov 2018 22:53:56 -0500 Received: from mail.kmu-office.ch ([178.209.48.109]:50442 "EHLO mail.kmu-office.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727773AbeKODx4 (ORCPT ); Wed, 14 Nov 2018 22:53:56 -0500 Received: from trochilidae.toradex.int (unknown [46.140.72.82]) by mail.kmu-office.ch (Postfix) with ESMTPSA id 79FF65C005C; Wed, 14 Nov 2018 18:49:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=agner.ch; s=dkim; t=1542217785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references; bh=SwMlKre/tFmczZhs5V8n/suDDZFv4a74AdJARw1GjVo=; b=am2cbIC/r851Yc7o4wxqAzI3K6GLtV0mtd8N3aueVEh2qP+9OqqBrv6ZHZ7tGKrWthPomB viHkP4qZfgnRteqMOaYHklnqGJ3lESMkbKM3N5ROAxbARkbrFww7YIZziBa/b9yxCBqxe1 Kz7CjwWg2WIVgRYnk1fKFBXGJ5vfVA0= From: Stefan Agner To: gregkh@linuxfoundation.org, jslaby@suse.com Cc: fabio.estevam@nxp.com, u.kleine-koenig@pengutronix.de, s.hauer@pengutronix.de, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Agner Subject: [PATCH 1/3] serial: imx: fix error handling in console_setup Date: Wed, 14 Nov 2018 18:49:38 +0100 Message-Id: <20181114174940.7865-1-stefan@agner.ch> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 0f67197a3783..313c3b1900a8 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -2068,7 +2068,7 @@ imx_uart_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.19.1