From patchwork Tue Aug 1 11:37:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arvind Yadav X-Patchwork-Id: 796188 X-Patchwork-Delegate: boris.brezillon@free-electrons.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="CGwp1BZj"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="P8vN15RS"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xMDqL157Mz9tWN for ; Tue, 1 Aug 2017 21:38:54 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=60QuzeRTy1nenbbOk5mEo5cIshoZL8XJ92YitnLVyUg=; b=CGw p1BZjJA5bCg+0XlbKOPJOps8cdCdHpDxlasUHXUxWZHmzdDB3bFnczQVurDw6mC5ZlgB0Dc6oBSph 71ubdWkUIqoImgoo0eGMw6jTN8BGjxaiPBWiSW+teiZ/6iAefEmNgUM4bg7Qj5+gzBTefHB14RrI6 It8l/+2m3qZm1SxJ0Z4rWknDrDUEDcu3LDBS97VBflflWjhsk7bGUcFyiExI6UqxAAjJ1rdKqg3rp JcpAyyiOcFSeH1DBcoKq64CDkfBnAQQUrGeqF6tEx3Ab9R+MEFcq+rU6ol07z8GzmDGs1bAeuIxnD xbuZO4t4zHkGIekmKyZyiTIC5I/lOjw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dcVVb-0003k0-Qj; Tue, 01 Aug 2017 11:38:43 +0000 Received: from mail-pg0-x243.google.com ([2607:f8b0:400e:c05::243]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dcVUz-0002rG-Dz; Tue, 01 Aug 2017 11:38:11 +0000 Received: by mail-pg0-x243.google.com with SMTP id y129so2284151pgy.3; Tue, 01 Aug 2017 04:37:45 -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=PlQ06jv62DP7EVbqZA+ibm+7cgWtq1ERX3fqE2Dq5nA=; b=P8vN15RSyxyyXyvSZ5rlLn+851lTkCEUm63I+24icvOOns4k5iRZsvPMRd+TyA7Opk HOP/jXvmqfxkXj/356GtikvZh5TbKIxncaNJVkVDAUsUJjGjzGqvm62KuWjCOr50q9K6 lEyR8Bk4lkjaVtcyARy+NlJ2sPMrxyteQOmlHjf3/3xirZ7cgJahUX3+gNNqYA9dPdhn YoECalCCO4HQ1VcONK7sx2GQwFfc1pNHOkgxfA7nGrG3xpk2bSD9X4fbBzC0DkU5UQrM HxgHb19vdJ2y52DuFa0ibG+C6KaG8Ut0ViJa8FwZodBNLcETiVRCvO3BQGmfFwTRXz7/ IQmQ== 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=PlQ06jv62DP7EVbqZA+ibm+7cgWtq1ERX3fqE2Dq5nA=; b=mudD1XlINiScy1ZjeDAXlTEETxzi7tz8CDYDR2TIOH9zCtka6f9mtzFwgU19EGTWwA cCHvKMNvL466QtkRkPi99xvAnhfaggrTPEtCglsMNYgNDphSwk7av9lk+UZZJT1Xs/X1 LhZ/RHD7UR0ChLQyv/zjw2UTYSZSmlEOvatoU7YOgugR1Xtkv9/XZbcik1WnaYg1dTY2 4QkKgl3Z6uOCK9o027sJsapEb5f9eN6fpyE5DW8gi3OjLisz2KyxiHliOaavgdfhgmLT 6y8vQ8GsdX4hpD+oMiA5wj2L6XgzmAPSqaX2uWBP8b2UZuWFvn4keAtJNafaRrAfARA8 Njiw== X-Gm-Message-State: AIVw1128xChb721JAbIHkL0IOuhMePQqC4Tr4jfXZL3nR7xLbXnENSps eEU1UQXIN78j4g== X-Received: by 10.98.32.195 with SMTP id m64mr18677770pfj.66.1501587464645; Tue, 01 Aug 2017 04:37:44 -0700 (PDT) Received: from symbol-HP-Z420-Workstation.zebra.lan ([223.31.70.102]) by smtp.googlemail.com with ESMTPSA id b4sm51691301pgc.9.2017.08.01.04.37.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 01 Aug 2017 04:37:43 -0700 (PDT) From: Arvind Yadav To: boris.brezillon@free-electrons.com, richard@nod.at, dwmw2@infradead.org, computersforpeace@gmail.com, marek.vasut@gmail.com, cyrille.pitchen@wedev4u.fr, narmstrong@baylibre.com Subject: [PATCH 2/6] mtd: oxnas_nand: Handle clk_prepare_enable/clk_disable_unprepare. Date: Tue, 1 Aug 2017 17:07:27 +0530 Message-Id: <1501587447-21079-1-git-send-email-arvind.yadav.cs@gmail.com> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170801_043805_565901_F458A575 X-CRM114-Status: GOOD ( 11.02 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:400e:c05:0:0:0:243 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (arvind.yadav.cs[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-oxnas@lists.tuxfamily.org, linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org - clk_prepare_enable() can fail here and we must check its return value. - oxnas_nand_probe() can fail here and we must disable clock. Signed-off-by: Arvind Yadav Acked-by: Neil Armstrong --- drivers/mtd/nand/oxnas_nand.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/drivers/mtd/nand/oxnas_nand.c b/drivers/mtd/nand/oxnas_nand.c index 1b207aa..7061bb2 100644 --- a/drivers/mtd/nand/oxnas_nand.c +++ b/drivers/mtd/nand/oxnas_nand.c @@ -112,14 +112,19 @@ static int oxnas_nand_probe(struct platform_device *pdev) if (count > 1) return -EINVAL; - clk_prepare_enable(oxnas->clk); + err = clk_prepare_enable(oxnas->clk); + if (err) + return err; + device_reset_optional(&pdev->dev); for_each_child_of_node(np, nand_np) { chip = devm_kzalloc(&pdev->dev, sizeof(struct nand_chip), GFP_KERNEL); - if (!chip) - return -ENOMEM; + if (!chip) { + err = -ENOMEM; + goto err_clk_unprepare; + } chip->controller = &oxnas->base; @@ -139,12 +144,12 @@ static int oxnas_nand_probe(struct platform_device *pdev) /* Scan to find existence of the device */ err = nand_scan(mtd, 1); if (err) - return err; + goto err_clk_unprepare; err = mtd_device_register(mtd, NULL, 0); if (err) { nand_release(mtd); - return err; + goto err_clk_unprepare; } oxnas->chips[nchips] = chip; @@ -152,12 +157,18 @@ static int oxnas_nand_probe(struct platform_device *pdev) } /* Exit if no chips found */ - if (!nchips) - return -ENODEV; + if (!nchips) { + err = -ENODEV; + goto err_clk_unprepare; + } platform_set_drvdata(pdev, oxnas); return 0; + +err_clk_unprepare: + clk_disable_unprepare(oxnas->clk); + return err; } static int oxnas_nand_remove(struct platform_device *pdev)