Received: by 2002:a25:868d:0:0:0:0:0 with SMTP id z13csp215144ybk; Tue, 19 May 2020 20:25:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzne63+YFxoanCrDuoNXmEKbUNhVMUrpeL0lxzfkKyaBzeUWqPSMRna0QeXlMvNW9bNrdtt X-Received: by 2002:a17:906:6a92:: with SMTP id p18mr2026490ejr.233.1589945128245; Tue, 19 May 2020 20:25:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1589945128; cv=none; d=google.com; s=arc-20160816; b=tcvUy4Xc8NDpUiCJhlIuyThqjnlQi6uXtPpGGEailzJhCDhL/SiDEtTlL/GR5xqPxg HiGe8N060pZceizcNNXrpCq9VqegrvexwwHcFjWWbvhDX0gKQKhaQxmboCR5r5aZzYV0 fPul3B5zHt3sLempudch0U3DkekAUq0mWqRsMKPlFyoxKZm9YJQ0u9cPPVJtcznAcfdJ uldIPRUgqteuPjaqnTI9dTyuOmIky0cYay/v4JvVuhqJ14r1BB3HMG9jE+J11fSTVxZc lNfjGlgdgl/hNG74oerDFouDbv632R4UIq2GDE6rSHoQdKvFgL3tqkheH6+0BBz3ewiU AugA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=H3LD04AQwmxN/W6G9Hm1qR+vU06ilPmJsdKj04uNnA4=; b=hPVuoCA6BjQKAzst0qimJnUBzENsJH1KThliPle/QeEnUjjcj2Mul+IURQWd6D/muc /7iP2jqM42PQXasNoNzp4PNYE7eHF+ZnM1ZQUCK2oPsGn1U8L7cvzrwMzERi7HfUWNZ9 0EAoOhkCtmRcTlsVjE7tLmvrbnHZhA4+TSWkk7ld3tqkwfjsaJkdwKlOFNMSSXL/v6aE LKnmjmD8bKZ9TRt8HXw8imI3/wdXGLghZGs97Wf2MMnN1KedTizbg4ppSw2PWiaSy7K1 LMoLh7Ed4Gi/r8GNkiIP10/bah+BxCyZL0GH4pMXgFa7sk6lPsHB5GpQLiDSDyahrUzC NJLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=DCz+sHF4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l24si716116edj.16.2020.05.19.20.25.05; Tue, 19 May 2020 20:25:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=DCz+sHF4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728309AbgETDVf (ORCPT + 99 others); Tue, 19 May 2020 23:21:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36624 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726352AbgETDVf (ORCPT ); Tue, 19 May 2020 23:21:35 -0400 Received: from mail-qt1-x844.google.com (mail-qt1-x844.google.com [IPv6:2607:f8b0:4864:20::844]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D6AB4C061A0E for ; Tue, 19 May 2020 20:21:34 -0700 (PDT) Received: by mail-qt1-x844.google.com with SMTP id a23so1546520qto.1 for ; Tue, 19 May 2020 20:21:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=H3LD04AQwmxN/W6G9Hm1qR+vU06ilPmJsdKj04uNnA4=; b=DCz+sHF4It2JSWZejzc2SvNTbmx85dJISq+sgdg0dUWXllA4lOVq2msJAtSdiv1wRm xEZazLGCamFvnKTJ5idqqsJyTT6NDYBVwliNcWXQ2qVhK3po4rHxUqT6VBeOm/xJgvE4 qibpNpqidLiKMhhBLw0Lz1UrwfMgGIx3hmMmyKCxMpC94i5wyetynGDJhH6KRRlhM45k vSxZjQcBRf+2plI1M5uEv3zDZp+ltkOQiESSW7CYH0FQqvpebhjxTfhg+fmvXx1g/DPw O28tGqbziISe3XYzPOMYGigcZnI39Re+nU8POnnvr+QheqGcxrPYKi1Ur7ef977G1gJJ QQSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=H3LD04AQwmxN/W6G9Hm1qR+vU06ilPmJsdKj04uNnA4=; b=SpyrjLksn3eZvmFNLZlrMP9v4SekLyi44nXYDh9yWyU2JfFRvPOIQZNxCKhaA9qYzT 0qRw8tpNCEqLlehxKxG8JeHbW8zkJJaFjsll8HRdMolyGXk/tqeSfNZxIgfqWQ3KQiB7 3YYPU5MIfvQ+owPnlTGz93t9hPS3a2o+Xsr9ugkGQigt6tkagfzrXfZo+xbhFyheN/Ee 1AgGYuq7sftEPEUZc/e6MOFDWhU7cNXR4ZdSrkZDRIwCm45FOfuVzmZ/uK+r2xu7P9dE DOLomSytIfBqDCs4iKQkg0FmfCgH27rEyGhXz0q62WfegkqjEZw5zud30mMX2Ek5CZ+A gcAg== X-Gm-Message-State: AOAM532I1dYMWoLtwpobVZm1BaRTnBUPoMT7udckEF0Aj4OS71a97n7S U0giVUEWR/Jfe6MN6b10gnw= X-Received: by 2002:ac8:5142:: with SMTP id h2mr3306395qtn.37.1589944893849; Tue, 19 May 2020 20:21:33 -0700 (PDT) Received: from localhost.localdomain ([2804:14c:482:919:d4cb:2d07:fb81:cec4]) by smtp.gmail.com with ESMTPSA id g20sm1210274qki.75.2020.05.19.20.21.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 20:21:32 -0700 (PDT) From: Fabio Estevam To: jassisinghbrar@gmail.com Cc: kernel@pengutronix.de, o.rempel@pengutronix.de, linux-imx@nxp.com, linux-kernel@vger.kernel.org, Fabio Estevam Subject: [PATCH] mailbox: imx: Disable the clock on devm_mbox_controller_register() failure Date: Wed, 20 May 2020 00:22:46 -0300 Message-Id: <20200520032246.12482-1-festevam@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org devm_mbox_controller_register() may fail, and in the case of failure the priv->clk clock that was previously enabled, should be disabled. Fixes: 2bb7005696e2 ("mailbox: Add support for i.MX messaging unit") Signed-off-by: Fabio Estevam --- drivers/mailbox/imx-mailbox.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/mailbox/imx-mailbox.c b/drivers/mailbox/imx-mailbox.c index 7906624a731c..3f7c4548c18f 100644 --- a/drivers/mailbox/imx-mailbox.c +++ b/drivers/mailbox/imx-mailbox.c @@ -508,7 +508,13 @@ static int imx_mu_probe(struct platform_device *pdev) platform_set_drvdata(pdev, priv); - return devm_mbox_controller_register(dev, &priv->mbox); + ret = devm_mbox_controller_register(dev, &priv->mbox); + if (ret) { + clk_disable_unprepare(priv->clk); + return ret; + } + + return 0; } static int imx_mu_remove(struct platform_device *pdev) -- 2.17.1