From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752806AbdCNQtS (ORCPT ); Tue, 14 Mar 2017 12:49:18 -0400 Received: from mail-eopbgr00094.outbound.protection.outlook.com ([40.107.0.94]:45129 "EHLO EUR02-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751680AbdCNQtP (ORCPT ); Tue, 14 Mar 2017 12:49:15 -0400 Authentication-Results: oracle.com; dkim=none (message not signed) header.d=none;oracle.com; dmarc=none action=none header.from=axentia.se; From: Peter Rosin To: Dan Carpenter CC: Peter Rosin , , Subject: [PATCH] mux: core: fix error handling in devm_mux_chip_alloc Date: Tue, 14 Mar 2017 17:49:58 +0100 Message-ID: <1489510198-10414-1-git-send-email-peda@axentia.se> X-Mailer: git-send-email 2.1.4 In-Reply-To: <8a1d806c-1626-0558-855b-02d7396baae4@axentia.se> References: <8a1d806c-1626-0558-855b-02d7396baae4@axentia.se> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [81.224.171.159] X-ClientProxiedBy: DB6P18901CA0020.EURP189.PROD.OUTLOOK.COM (10.169.208.158) To AM5PR0202MB2547.eurprd02.prod.outlook.com (10.173.89.8) X-MS-Office365-Filtering-Correlation-Id: 3226bc70-690c-4947-d9f5-08d46afa082f X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:AM5PR0202MB2547; X-Microsoft-Exchange-Diagnostics: 1;AM5PR0202MB2547;3:aoEE8wvGsbiiuMBFw9QRs6Oa5rNFiBueqVosLHWBktP6oqrZCE735+q8KZgk4wT78kECN+2FUgwMn1Ta7NJeaOaA7nuUfYEjwB9VEBLsg8FhT+Fs/Du27BaJCrApS/bRrAWbXbunnH+QVnBCHlH1gG3X6w6FZXGROV7GXDXwwChkbNVEGTCqJlGcf1wHQYlD3AjIU+i/13l1gvc63uIk0YGJjQuvJdEzvLnlt5dNcQL8j7yReSboAeOWXpCIeYD5KLiO5f10yuT6P8xgy1EqWg==;25:QBdtdWlj9vnPfId4N6TJUGjmmJCYceiieTMHCS1dsbRygUE3/c4p+GVfZHkw2eme5Hf5tUDBLDkD1svtOZZkhtEYbb1YxvqExCn5Dg/PnLYPiF3Dp0So0sFhBeHTNKGcvmp3fqR/dy2zIAF36DY5CVCrJUCE963vG9eYhGieYzIkfYnAHl/X798j5i0RawNPrkw26sVbjxRZSPm4dRqVjA5VQ3oW9auQhdKFI/WXf4Rgh3j71VAVcGgXJrKveAynOBDRf091aFz4BpZvu2AuSqW5vWirlnyeDjS7uPGIQQJC7UgGFQD9J0K3El14UH68M3gNvD/VBFjmyhHtaHaeBGZp6WttkIwOPvcXua3KFc/Q/yymVaohc97Ei8KTxtGFY7x9B1YPAVhq6pzgWywawkCMd1X2O3+H1LnzK2JKSQfJTCM+5N3mY4m81vXAWrGgu7fhuJsvwCwrhl1MKoLcQA== X-Microsoft-Exchange-Diagnostics: 1;AM5PR0202MB2547;31:9tbADm5z2M/pHcMbm97XbTarfE4ihF0L/9Htul5j9rtH4kR9wv56aG82xvlm+pIlgQEdfGTyIHAlWUDsawcji/+LFM0ubbsB+b+HOCpg5cObFThKXZxQBVEhbO3qpgVGvCSxXIKmWekolTUhCpdovf27ggXu3N5XOOUjVLSKOlhzm/7Fp5xKgpo/RLqNyt/qNikt83FiHwS4gQ9cb+f2HEibGDOB7Gfqb0NciNz1O/E= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(146099531331640); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6041248)(20161123558025)(2016111802025)(20161123564025)(20161123555025)(20161123562025)(20161123560025)(6043046)(6072148);SRVR:AM5PR0202MB2547;BCL:0;PCL:0;RULEID:;SRVR:AM5PR0202MB2547; X-Microsoft-Exchange-Diagnostics: 1;AM5PR0202MB2547;4:4bhynNkvEFUnhnvWWuSIUhK28l4jcG1fGc5byG7LgSajzpZwzucxOryEm0oRxm2s0VJ8njfZ0dgjmNeQek3bDYrMcuxPOGmY2vdG+2FpumXOuLI7guEpSFDI87jF6obMgumXMn6Oz1F5YOuyD7LI210NMZSuwOwIzPJCzJlrB17HEk/3LfoNqPubmuFJ3vITWSXSGQu0Wv/sVti2y2iM4MjV6CxMddboRDlFTrLqGppjFRm1Uff09IjnwsCAmzAqgdVPj0n4ICdNHlpNU81ek2ILTEgzdmW18Q5KmoC87Lw2n1vetE70VMo07pAjnDZ8Cm6j+8GcNnS470lCShFvIHjU3WquSp/wzSNopZQEfv60iPU/+ljdQCVCIDNGuy6MDfv+AFhpXpnMQxoktWG4XxCeI9QjMrZK8U5oqjslPY92lhNGHjx5B0Cvnxg8LFkA8L8dUBoy/aDoMuInwC2CRZ6U5jFmXPvNY2JlnJ8liYi1WLjxn330FjY8ZgJGCct1udysG9N4FKjVeXfbEJgjZnyek7jcvfXPUcufCcr7Gmat/x+K1y/6BL6xwXlDbPFoiRs6asvWT2pXFbiLIhlbSDseOHP1+SE4BWNVzr6+Ii/v/2JNGDsmqb7eY1oWM8DNkm/Qm/WijGhMDfPxIBalUqhQ1wf/FY6OK9frj0XRoxx5EkN5azNR8iwM6ZUC398fCF+wVUUMr4fbSpkAQdJ9Gw== X-Forefront-PRVS: 02462830BE X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(6069001)(39450400003)(6116002)(3846002)(5660300001)(81166006)(189998001)(2950100002)(38730400002)(4326008)(74482002)(8676002)(110136004)(5003940100001)(47776003)(66066001)(7736002)(6666003)(53936002)(6512007)(6486002)(54906002)(86362001)(6916009)(305945005)(25786008)(33646002)(6506006)(76176999)(42186005)(50466002)(50226002)(2906002)(50986999)(36756003)(48376002)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:AM5PR0202MB2547;H:localhost.localdomain;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;AM5PR0202MB2547;23:Hr/froQZDdCKU4n7D48V6x8bL3ftJmH+HUaHmXA?= =?us-ascii?Q?fjJ58oSdtEkB/Tmv1Rbd5JOxbNyS6oekutt5mG76lYFvfgodWiGikTkaFaTm?= =?us-ascii?Q?Doa3NTLtRZZ6WqzqU6YT4/3K6ORPaCrsEBI8qXgQgcjGuwhsZ0oMIAmqxUS4?= =?us-ascii?Q?d/lTWiiUcuju3zDFAw6ThLQ5ax6cKfglKkelTXwS8XTPGIp5GS4boA1Q6V7Z?= =?us-ascii?Q?Phlsj4x3Hx6vpQTvr5CeSCeVkGfqyzh4Ikm4ldQTYM6qyfmWzd1yq9xVBiuj?= =?us-ascii?Q?a8oioT6NXqQosDXEsPIiT0ZrS3PwnGKpPnhdA0HX5rfku5w08omBt2n7nyDt?= =?us-ascii?Q?9lFTat4aJlo4osmF3NwsLWd08xncqyEKuv4ysN86faQRAwAhqJyPlsXLU53a?= =?us-ascii?Q?RQIdvmkeSJ617runDmyo8c81bkPGkxd7iOrFzxLiaR4cPhXv5k5Li+uU4hL+?= =?us-ascii?Q?BncautQ3X5/8SQ29B8NCFwKxFInPKUwP/K6+7F4HBiCQz6NdPtlOpV/lptnp?= =?us-ascii?Q?H9gII4w049QMcWmJ7ZZ4seWMj15e0qPk0hFW4LRr1Rjp8sw3qdYzqKO2RMEv?= =?us-ascii?Q?vLpf47r4pM/IDjIoDzY2XmJG5rwdllLk2TyqwN23XxqrHvoTFz5g7nD1fuRM?= =?us-ascii?Q?YIclBMnQTuWFPQrng49eaIdVLzuFShrqHfvu7hHu+I72aAGy+kzr4hfbroY8?= =?us-ascii?Q?DqSLQG5a5jX79T6dfNu5OEJ7Bv+hlo8ykqHZzwvBuFq63UMrSEl194C+MMZZ?= =?us-ascii?Q?lGHa1PZ3+1IhY+V6SsgAT9eIEhSKT/Xv79mGf5JPV9EJ/RatQMZbklO5UM4Y?= =?us-ascii?Q?4XzvnIV/GQ0PQQN1kUhvK9iaUxuUIUBMsx+2veitx/i76WWi0mnA03QI/GNO?= =?us-ascii?Q?Pr3KVh8BGWofkT2F+se6XaEOTxVwOMg45m2UW8poTt+rLJLJN0MFRDgHpJH5?= =?us-ascii?Q?yAe1Rpz7YaZA7iB/wjl85GxG/6m4YSix3/1TrLQa59g=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;AM5PR0202MB2547;6:0Hw63YxcekPh5lkZ6Pxd9roVGCTj0P9MpWylh5VlGNqQaqOFhSJovnCeV2XpkgsIpGNT5eQEXv43w2d5XJOE65bz+2vaAEPJJoIyQckBNE0Pkeoe9ufEzPmW/trWLcQiIeJ6ehrivzO1N8r8IzFMPzj7Bd4/hZyELa8xte47PEenOw+yJsBvGPcFjhQIZeXL8uZ9VHt9B6kcOufuuikh1Hi688COW7yqxHXNvypVguDd4hkuAWL23lQFa17hODPwBb7IgqMgvZL44USmvA1bjXuSpiImYsh2iu0H/OL6yOxeeXZ3VX56NzrOmPnIuLuc68JlODXGpVdjqN6vAtxtjk1BJ58iEmy6GEXTUr9R5Q/jMA/6lR0K9gwGPhcU9oBjblVG7RHOxctDePXWVvEiSQ==;5:kQvmS38cngCRQG4kUNlYDdwdC+tx4ACSfh4Hpg4ZTo1mA2PYhD7V6h1gIUclEazlcZ6e4TaFY4bKbfjw23KH3b2ATokKDTessLoMljQl9IdMCj4DzOMvzr0F3ymuL48RgKKFcFCecLkk+zlRocfAEg==;24:v2GgZkE40UahAy08cESGaHzKMzZxuH5+Znw06CJWnasWSRsu0VNFI7BQWITkyC5eyX1k/5VKGsL3mCwFNrXHdHV0b5FCIFNSFss4GG9/1QQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;AM5PR0202MB2547;7:7DI/p86SRMR2DdGzpZMI6iuRS+TrPQ/qi0jf36qavH6apoV9cmyyKINJigqWt6zVmDTLrcfjDUz4B66X23k3Bg/2AXYX+ts8SxgywWohjdHhdWIq4A8RPoYYN27KBNBYWYqTUqsxhEuFm6gGw8nNPRavuL8Ac0ef+yfLThfO3FhgTsdqoeqPOoKobBL/MR1zwSBjds/yoMP5LxhSoz3vkRa7k10jFe89jIQxizReoJvaj6ovFsy9LNNYQPkGzcMw0ca50NNGY/r6+jHsSamJvinATiB1V6Oairs0NJemClWQ9ip/IaHghaQpc/QZfdfizgG9hRCIsUUGgyLrdiX8Mw== X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2017 16:49:07.1398 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0202MB2547 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The error handling is mixed up. mux_chip_alloc() doesn't return an error pointer (just NULL on failure), so check for NULL instead of using IS_ERR. devm_mux_chip_alloc is documented to return NULL on failure, so fix that as well. All users of devm_mux_chip_alloc() are coded according to documentation. Fixes: a11c524a6b90 ("mux: minimal mux subsystem and gpio-based mux controller") Reported-by: Dan Carpenter Signed-off-by: Peter Rosin --- drivers/mux/mux-core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mux/mux-core.c b/drivers/mux/mux-core.c index 900b88526f97..66a8bccfc3d7 100644 --- a/drivers/mux/mux-core.c +++ b/drivers/mux/mux-core.c @@ -166,12 +166,12 @@ struct mux_chip *devm_mux_chip_alloc(struct device *dev, ptr = devres_alloc(devm_mux_chip_release, sizeof(*ptr), GFP_KERNEL); if (!ptr) - return ERR_PTR(-ENOMEM); + return NULL; mux_chip = mux_chip_alloc(dev, controllers, sizeof_priv); - if (IS_ERR(mux_chip)) { + if (!mux_chip) { devres_free(ptr); - return mux_chip; + return NULL; } *ptr = mux_chip; -- 2.1.4