Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp1233027pxj; Wed, 19 May 2021 01:06:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyYnYKp4GenoZxMXmsfSO9IaOewyaz+YeaUgBDQOJtZqu0fCjTsiRpC+9HKuzbJnF/2V1DH X-Received: by 2002:a05:6402:848:: with SMTP id b8mr12787994edz.159.1621411564376; Wed, 19 May 2021 01:06:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621411564; cv=none; d=google.com; s=arc-20160816; b=GQ7qBgKXVz/mQOTsFaQNdKe/f6t2T9UIM5fqHMvq0aKJuzx7X0RiqkNgJeHbakCp+C pUnISKiN7BX4GiyFHQ5NoMr7WLmAhHe6VwCIZcPyOqObXEQyDqvC2s9K6wGgUsyBTqJU Si+0t2B1ZMNmk1hIGW81C6w6MyFT5Veh6EbUPjNBkAYTQqFKFjmLcLnDjJ9P/a4LZIGS 20jS9YjawZ6d28TFxr+12ceSLSf7x3J2o/PDlWG53DtDImpCM2VzlgyS0nunPX9Gx8St Onvml+72Li0YUeLUw3fmBmSC6HwYsKBxyHw2Nxb/q3fe4sRXSzqTnR8D0IrBvrrC/QqV ZGSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dmarc-filter:sender:dkim-signature; bh=OCZ7uak29LEl8jJmUhLI4AIqfTsr8cXO52ZSocwTCrQ=; b=rNAxg2DzhJR7ctsQdoydgLRoUs4cNW3Y0e7iEmD1tR4Gh0u7S47IAIRDNlwfqxqsPa 0epI1/m7D59o9Tb7m+PDTgEl7ARs0ZnaUP1SQwdKw6/jFjTC/5GnG9ufYew+oVI+54tm 1Dc32kOj0KIfluWB9VkVtZpdZDFIUxmK8Neqg2x9ejgar1wAdtYMdK6UutYIuH3cHhRE AXqGjzwMTSARlv3LZaKlI7j62YcvAyOswdDUSa7xup8MLSh7Q8MC00Rk6YSartFSJxzg wU2OfAlhWqDBES/mq0+c/Lu1HUC6OfLrZFNjsNfnHUcEcJoxDG3E2hQtlvF2f/DRD1IF 9DfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mg.codeaurora.org header.s=smtp header.b=hO5z3x0P; 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 lj17si19703230ejb.535.2021.05.19.01.05.40; Wed, 19 May 2021 01:06:04 -0700 (PDT) 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; dkim=pass header.i=@mg.codeaurora.org header.s=smtp header.b=hO5z3x0P; 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 S243974AbhEQUsB (ORCPT + 99 others); Mon, 17 May 2021 16:48:01 -0400 Received: from m43-7.mailgun.net ([69.72.43.7]:52942 "EHLO m43-7.mailgun.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244292AbhEQUr7 (ORCPT ); Mon, 17 May 2021 16:47:59 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1621284402; h=References: In-Reply-To: Message-Id: Date: Subject: Cc: To: From: Sender; bh=OCZ7uak29LEl8jJmUhLI4AIqfTsr8cXO52ZSocwTCrQ=; b=hO5z3x0P+jN9Ju2mLwftv7bZy7fDocZc+3VJ/sjFnPPEop+MTanqeUUxaJMbnNsHSH0ElrSE 43hY1dlfeMldino3fCUXU4/IYnMmGKDpigU7wdNqr/l/kXBSsA1Cfb+dEWMHHCg0iiNjJLf5 8rIA3AdzZApwxiLKvYf+vLsv92I= X-Mailgun-Sending-Ip: 69.72.43.7 X-Mailgun-Sid: WyI0MWYwYSIsICJsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3JnIiwgImJlOWU0YSJd Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n01.prod.us-east-1.postgun.com with SMTP id 60a2d61160c53c8c9dec21ed (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Mon, 17 May 2021 20:46:09 GMT Sender: sidgup=codeaurora.org@mg.codeaurora.org Received: by smtp.codeaurora.org (Postfix, from userid 1001) id DF8EBC433D3; Mon, 17 May 2021 20:46:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-caf-mail-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=ALL_TRUSTED,BAYES_00,SPF_FAIL, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from sidgup-linux.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: sidgup) by smtp.codeaurora.org (Postfix) with ESMTPSA id AC5E3C433D3; Mon, 17 May 2021 20:46:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org AC5E3C433D3 Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=fail smtp.mailfrom=sidgup@codeaurora.org From: Siddharth Gupta To: bjorn.andersson@linaro.org, ohad@wizery.com, linux-remoteproc@vger.kernel.org Cc: Siddharth Gupta , linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, psodagud@codeaurora.org, stable@vger.kernel.org Subject: [PATCH 3/3] remoteproc: core: Cleanup device in case of failure Date: Mon, 17 May 2021 13:45:49 -0700 Message-Id: <1621284349-22752-4-git-send-email-sidgup@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1621284349-22752-1-git-send-email-sidgup@codeaurora.org> References: <1621284349-22752-1-git-send-email-sidgup@codeaurora.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When a failure occurs in rproc_add() it returns an error, but does not cleanup after itself. This change adds the failure path in such cases. Signed-off-by: Siddharth Gupta --- drivers/remoteproc/remoteproc_core.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 45d09bf..6f5fa81 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -2326,8 +2326,10 @@ int rproc_add(struct rproc *rproc) return ret; ret = device_add(dev); - if (ret < 0) - return ret; + if (ret < 0) { + put_device(dev); + goto rproc_remove_cdev; + } dev_info(dev, "%s is available\n", rproc->name); @@ -2338,7 +2340,7 @@ int rproc_add(struct rproc *rproc) if (rproc->auto_boot) { ret = rproc_trigger_auto_boot(rproc); if (ret < 0) - return ret; + goto rproc_remove_dev; } /* expose to rproc_get_by_phandle users */ @@ -2347,6 +2349,13 @@ int rproc_add(struct rproc *rproc) mutex_unlock(&rproc_list_mutex); return 0; + +rproc_remove_dev: + rproc_delete_debug_dir(rproc); + device_del(dev); +rproc_remove_cdev: + rproc_char_device_remove(rproc); + return ret; } EXPORT_SYMBOL(rproc_add); -- Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project