From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7101DC2D0A3 for ; Tue, 3 Nov 2020 21:00:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2E5D12245F for ; Tue, 3 Nov 2020 21:00:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604437250; bh=2Yz2xEErkZQJQOISDsFOjOtFmt+uEt/xKpdPrlvAbeg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=qVXV0Zt30SQxSyH2xvBLTUBdhXEHtyh5yBHnKTgqjJV8w3aCsygUuWsDoxuduFy+n O3slI/VNmDNkheIkIjR6vL1g9Z2aRUdsBHHpNO1Zx+T2T17iE8LMXJx8QcmHFWKNdI qJhDwAfr1rW/4Yn3NHdYJdmlcmiE6L5EfvKhqEcg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733273AbgKCVAt (ORCPT ); Tue, 3 Nov 2020 16:00:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:36844 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733288AbgKCVAs (ORCPT ); Tue, 3 Nov 2020 16:00:48 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8EBF6223AC; Tue, 3 Nov 2020 21:00:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604437248; bh=2Yz2xEErkZQJQOISDsFOjOtFmt+uEt/xKpdPrlvAbeg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xP8zwcefFMtOJYOeUuJ137eURp+EyTcILsr4od20/0LaoTbR3TDGOvMhgwFDDIhuw mRtgF3XiqivTEJ3AYtK0oPJedvegXgpdWcJBmFCn1pqJklFsXbCJHNvO7D9HZGRDV1 NXvGUPNSxatzW1gOdIEpI82v8q6/QvSPxrQPnrxI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sven Van Asbroeck , Jing Xiangfeng Subject: [PATCH 5.4 210/214] staging: fieldbus: anybuss: jump to correct label in an error path Date: Tue, 3 Nov 2020 21:37:38 +0100 Message-Id: <20201103203310.280795262@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203249.448706377@linuxfoundation.org> References: <20201103203249.448706377@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jing Xiangfeng commit 7e97e4cbf30026b49b0145c3bfe06087958382c5 upstream. In current code, controller_probe() misses to call ida_simple_remove() in an error path. Jump to correct label to fix it. Fixes: 17614978ed34 ("staging: fieldbus: anybus-s: support the Arcx anybus controller") Reviewed-by: Sven Van Asbroeck Signed-off-by: Jing Xiangfeng Cc: stable Link: https://lore.kernel.org/r/20201012132404.113031-1-jingxiangfeng@huawei.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman --- drivers/staging/fieldbus/anybuss/arcx-anybus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/staging/fieldbus/anybuss/arcx-anybus.c +++ b/drivers/staging/fieldbus/anybuss/arcx-anybus.c @@ -297,7 +297,7 @@ static int controller_probe(struct platf regulator = devm_regulator_register(dev, &can_power_desc, &config); if (IS_ERR(regulator)) { err = PTR_ERR(regulator); - goto out_reset; + goto out_ida; } /* make controller info visible to userspace */ cd->class_dev = kzalloc(sizeof(*cd->class_dev), GFP_KERNEL);