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: 9874523 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7209E60365 for ; Tue, 1 Aug 2017 12:47:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 67D6B28695 for ; Tue, 1 Aug 2017 12:47:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5C794286B4; Tue, 1 Aug 2017 12:47:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.5 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from mx1.tuxfamily.net (mail.tuxfamily.net [212.85.158.8]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EBC5128695 for ; Tue, 1 Aug 2017 12:47:57 +0000 (UTC) Received: from listengine (helo=tuxfamily.org) by mx1.tuxfamily.net with local-bsmtp (Exim 4.84_2) (envelope-from ) id 1dcVem-0004RC-8h for patchwork-linux-oxnas@patchwork.kernel.org; Tue, 01 Aug 2017 13:48:12 +0200 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]) by mx1.tuxfamily.net with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1dcVUg-0003V4-EF for linux-oxnas@lists.tuxfamily.org; Tue, 01 Aug 2017 13:37:46 +0200 Received: by mail-pg0-x241.google.com with SMTP id l64so2283272pge.2 for ; Tue, 01 Aug 2017 04:37:46 -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=qjR9ClF4xdqVnl+D/uQ6JXTk7IQ4de6UKv0D1s3irt8meO9HqwNMC2bzxfgzCAejOC njXdlD7MIfnTHcJTgDKhK0n0DNcXkQVL/OEDPTXu3lok+a1uzoWX/U/Q3H36Em+O8fYx 5d0fguqseEL5x2L3H5ZuMxEiIGZODSkbpXo4lXfis2DkS/a0pIFgTf358s+eCeEhmLfc Ph2iQ/TvAwAds3PLi+8HbIDQ/wGEt6lru38ZMo9SrWwmWR9adagM0Dipq16FCqNqDmCz FgGagEQmpBZG4v3QOmugFZUh0s7Jq8YpoyHXyp+wLcbsEqWieO7IS+87UfRiY295iUCQ 7gDw== X-GM-Message-State: AIVw113HcGr+CvhCLstgC7sAr/wz/FpBV8hLzhFfK8nFvAKtH0Duy8tv +fN/T+Q5HXCQEQ== 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 CC: linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-oxnas@lists.tuxfamily.org Subject: [linux-oxnas] [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 List-Unsubscribe: List-Subscribe: List-Help: List-Software: Listengine, VHFFS 4.7-dev-2b25a01d00 List-ID: List-Post: List-Archive: Precedence: list Reply-To: linux-oxnas@lists.tuxfamily.org X-Virus-Scanned: ClamAV using ClamSMTP - 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 --- 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)