From patchwork Sun Nov 11 07:55:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Brezillon X-Patchwork-Id: 996073 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=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="uJckgYk3"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="BXaFLoo+"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::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 42t5qL55hqz9s3q for ; Sun, 11 Nov 2018 18:58:22 +1100 (AEDT) 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:References: In-Reply-To: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:List-Owner; bh=2SqmZtkvG+zVlmOcjht2+oezXKK4htukt+MPgya7Q7I=; b=uJckgYk3eO1BuY7ON3jHx/8Fru JJ817hTIWM/6LAL5xyIp0XhJUgj/FzQjeMpFrCSqvnUmXHUc2lcBn0wJXa2Q3LNmKa4ogivTjVFhW BVSBFTQrPoXcLGs9XVGdyqHY5Ubbfr7yB49Q1EKH3NXnp/TBccFOmb8Q3dgKRvJel7Gg9m8pM9SMz MMvg1uKiYd9bBS6V7TE9VyOwTczKr6PtnP88xpKbaVR5739LYlfzo7NjeROhX8SxT1v6j/xWYOStC L9VeZescaOoRWt09wkqcsGb6FOUVTImftWiyL9dn4eyk9JIFeJdonz7K3XjHdJTXshN35n46ElhCO HUOgWXLQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gLkdN-0000KY-M6; Sun, 11 Nov 2018 07:58:17 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gLkb5-0006XS-SX for linux-mtd@bombadil.infradead.org; Sun, 11 Nov 2018 07:55:55 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=qqELBHlZB9Gmo8w8y7j5g6HKj3b+VGVangvJtqVjlw8=; b=BXaFLoo+7Xx60/jgxO+EiOurh 2/SugNlvsjlKYCPdghqVHi3TXt8oOYb1RMpNzXehRBuuBjaD745qJkjuu68C0My4FNa4oeKIRXAVm d2/ThEOnydNAh035SmQb+BTw3Pj/5H9afLlmlNEQiqv+U1/akyhZtmHrvQ39sQRXf/ftt0DNMWTe5 F9u4adQYSxm7R7xlRqZ5v77WCSAsTj0FmVHY3pj17QfM+tXe96Ugxr0y9TmOgOG6XfKb0rAxjFupY WmFSm5TMA6u8eS57R1bUqEHJg9owYxoF6S1ucRHqtoCjIo0jV2xeyI8eaCl6LeZM1nkz7UMRO2IM2 eWs/cTvkw==; Received: from mail.bootlin.com ([62.4.15.54]) by casper.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gLkaz-0000Qg-TV for linux-mtd@lists.infradead.org; Sun, 11 Nov 2018 07:55:53 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id EAE52224EA; Sun, 11 Nov 2018 08:55:30 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mail.bootlin.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.2 Received: from localhost.localdomain (unknown [91.160.177.164]) by mail.bootlin.com (Postfix) with ESMTPSA id 81331224CD; Sun, 11 Nov 2018 08:55:30 +0100 (CET) From: Boris Brezillon To: Boris Brezillon , Richard Weinberger , Miquel Raynal , linux-mtd@lists.infradead.org Subject: [PATCH v3 10/22] mtd: rawnand: ams-delta: Check mtd_device_register() return code Date: Sun, 11 Nov 2018 08:55:12 +0100 Message-Id: <20181111075524.13123-11-boris.brezillon@bootlin.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181111075524.13123-1-boris.brezillon@bootlin.com> References: <20181111075524.13123-1-boris.brezillon@bootlin.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181111_075550_038665_79C16D56 X-CRM114-Status: GOOD ( 15.49 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.1 on casper.infradead.org summary: Content analysis details: (-0.0 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 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: Maxim Levitsky , Marek Vasut , Tudor Ambarus , Janusz Krzysztofik , Stefan Agner , Masahiro Yamada , Harvey Hunt , Marc Gonzalez , Han Xu , Xiaolei Li , Brian Norris , David Woodhouse MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org mtd_device_register() can fail, and when it does we should propagate the error and cleanup what has been done before. Signed-off-by: Boris Brezillon Tested-by: Janusz Krzysztofik --- Changes in v3: - Add Janusz T-b Changes in v2: - None --- drivers/mtd/nand/raw/ams-delta.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/nand/raw/ams-delta.c b/drivers/mtd/nand/raw/ams-delta.c index 0fc7563fba10..c59672a92832 100644 --- a/drivers/mtd/nand/raw/ams-delta.c +++ b/drivers/mtd/nand/raw/ams-delta.c @@ -283,10 +283,16 @@ static int ams_delta_init(struct platform_device *pdev) goto err_unmap; /* Register the partitions */ - mtd_device_register(mtd, partition_info, ARRAY_SIZE(partition_info)); + err = mtd_device_register(mtd, partition_info, + ARRAY_SIZE(partition_info)); + if (err) + goto err_nand_cleanup; return 0; +err_nand_cleanup: + nand_cleanup(this); + err_unmap: iounmap(io_base);