Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp4084897pxb; Tue, 26 Jan 2021 12:00:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJxZJfz/gjWj1m7q/+GWYxRUVr2yDahlOBpdZSGvPTilkAFrEUhs3oUJHi/5wpczKBOSsM+I X-Received: by 2002:a17:906:a453:: with SMTP id cb19mr4559963ejb.459.1611691223302; Tue, 26 Jan 2021 12:00:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611691223; cv=none; d=google.com; s=arc-20160816; b=SoxegjZS1C2EcrdruSxoI0554Gd49asQ+UgH9Bjnx9lDcgO9FqTsZsXPVM5FKrUmIf m3JQCiJOO1FTxU/eHQk44BBYlzjJ4Qj1CM213/IOJOL4AYkzq3MHbhkNEVhi5f/gpdVJ 7fnuhPinP8A/J5Ru4bsCpTpWsVSKMar4KeP2sbPY/ew4GUicAV7ryGzkWB1xAENzOvXB LRba+C5IaP2EseSilYC25FEtZwsJkRoGtmns4FEj8+HJ4ugHyDF1Wea2Xnn9oZU1xUYD kQtIRQlm67wsg1mq02XIP2ysFCj/3tjC4iCfqBqVJN0xciRtweQV18M77HBzP7Is8fQa qfOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=nf79ebcQbtlSf6aOEr+88+LXDEou8tlG+b5/Mw+PlkY=; b=gNuJ7G1vCDpEVXec6A4GsEDsueobfmV6WN5gG2T+lEZLPtHl5oAI5IPTXFMJmXgW8v XoIt3IC8Lzkp8oA6nN6UmPZZOQnfthDVsZW7TXKtHQlBg0/I1fcPsn5SHjRZ8bPedbsb d2P5lBYTs4AyHDOxsLUgB89xKkQXYzTY6NeT42MIiCPT2E5hk9oR6IgAOBXk/lWHDmtA LWGzIdHDcoyN5XmXECgZUq05/zumAaEmbw+a1s/boD2QkbCSZAnJwBE+pn7dPs3HlSQv v+vYlSE1Vq7aiB4E9wrILP/Ce0VZgpD3V/qL24jsFwgOGGdrwz8o1RQF4tVvftHrcAmr yXkg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g20si7515153ejf.236.2021.01.26.11.59.56; Tue, 26 Jan 2021 12:00:23 -0800 (PST) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391796AbhAZRdM (ORCPT + 99 others); Tue, 26 Jan 2021 12:33:12 -0500 Received: from mail.v3.sk ([167.172.186.51]:48082 "EHLO shell.v3.sk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2389342AbhAZHio (ORCPT ); Tue, 26 Jan 2021 02:38:44 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by zimbra.v3.sk (Postfix) with ESMTP id A5EF0E0B03; Tue, 26 Jan 2021 07:33:43 +0000 (UTC) Received: from shell.v3.sk ([127.0.0.1]) by localhost (zimbra.v3.sk [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id u4fMlcvWkBjT; Tue, 26 Jan 2021 07:33:42 +0000 (UTC) Received: from localhost (localhost.localdomain [127.0.0.1]) by zimbra.v3.sk (Postfix) with ESMTP id AFFE4E0B05; Tue, 26 Jan 2021 07:33:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at zimbra.v3.sk Received: from shell.v3.sk ([127.0.0.1]) by localhost (zimbra.v3.sk [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 1w52DoKF2SmU; Tue, 26 Jan 2021 07:33:42 +0000 (UTC) Received: from localhost (unknown [109.183.109.54]) by zimbra.v3.sk (Postfix) with ESMTPSA id B8731E0B00; Tue, 26 Jan 2021 07:33:41 +0000 (UTC) From: Lubomir Rintel To: Hans de Goede Cc: Mark Gross , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, Lubomir Rintel Subject: [PATCH 1/3] Platform: OLPC: Fix probe error handling Date: Tue, 26 Jan 2021 08:37:38 +0100 Message-Id: <20210126073740.10232-2-lkundrak@v3.sk> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210126073740.10232-1-lkundrak@v3.sk> References: <20210126073740.10232-1-lkundrak@v3.sk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Reset ec_priv if probe ends unsuccessfully. Signed-off-by: Lubomir Rintel --- drivers/platform/olpc/olpc-ec.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/platform/olpc/olpc-ec.c b/drivers/platform/olpc/olpc= -ec.c index f64b82824db28..2db7113383fdc 100644 --- a/drivers/platform/olpc/olpc-ec.c +++ b/drivers/platform/olpc/olpc-ec.c @@ -426,11 +426,8 @@ static int olpc_ec_probe(struct platform_device *pde= v) =20 /* get the EC revision */ err =3D olpc_ec_cmd(EC_FIRMWARE_REV, NULL, 0, &ec->version, 1); - if (err) { - ec_priv =3D NULL; - kfree(ec); - return err; - } + if (err) + goto error; =20 config.dev =3D pdev->dev.parent; config.driver_data =3D ec; @@ -440,12 +437,16 @@ static int olpc_ec_probe(struct platform_device *pd= ev) if (IS_ERR(ec->dcon_rdev)) { dev_err(&pdev->dev, "failed to register DCON regulator\n"); err =3D PTR_ERR(ec->dcon_rdev); - kfree(ec); - return err; + goto error; } =20 ec->dbgfs_dir =3D olpc_ec_setup_debugfs(); =20 + return 0; + +error: + ec_priv =3D NULL; + kfree(ec); return err; } =20 --=20 2.29.2