From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B05416149 for ; Mon, 21 Feb 2022 01:47:15 +0000 (UTC) Received: by mail-pj1-f68.google.com with SMTP id om7so13636720pjb.5 for ; Sun, 20 Feb 2022 17:47:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :cc:references:from:in-reply-to:content-transfer-encoding; bh=YhojBWVK4UiEqGQSq9xm7bnPmCBpgHMKvLchmEMssxs=; b=GlK21yrXja4jNo1iNtBTRnPdeFQI5GpeylgO4iDFg+CzXF41SDjFSj8xiPCGjoIYGt 8GsdIrxUZLSUp895Aek9lp3KaiKcnx+8FG/dZ1Z/bSCNS9TKJMpgrTIU71kbmxNE5GPJ d2hFqUN93utB3CZO92u+RdM136S1a9RKYnx9mm2RPtLgHaFWy4WDf6/EuIpk04lnzXa9 R3SZxb9eK4ZJVuFwuZPYRIBSROenJv2ywEYhuS4Ym8WqDFZTUPlbX1YJ1C9wbLIBgGpv RNEKatUz1IqL9dvwziyhI6d8zo+asOlyWCuWEF5OQIPFKBJZShhhy+KZNPkeHambjgWo 3F/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=YhojBWVK4UiEqGQSq9xm7bnPmCBpgHMKvLchmEMssxs=; b=msPHVIcCrdrLBaaK3kGprpOeSoDBuu4SXJaj5entlvIu06ZiiVDspx67wkp/Bofos8 GkpHul+Ub1tWv0fA+OazflU7FlpJBx4Cch5mlGu4YVepA4f9O7I0kyfQKvFCWKltKo6+ D3iYLdf4uoGJAFgtbIeBxvZoWWz9rmxH3n9oiOkE5MQH/TZXOU4eIboFr4yiWA2r8itA 74ZoVnPBygkKl5adXXVoWgV80Ew5zR0U8/VM8hQJanyrqaJmj6oLASPPDRyihu1WaYGy hQt02jS5iQ0yAgHLMI8OrkYaxI555PSlqY9i/PzjtCat/u3D9SMCbUKYMCbofewSxtOv jkEg== X-Gm-Message-State: AOAM531hKZaKNx/jTWBO35m07nlbenGKZy8jKYAk0wOzayaaYtb1hWFd 9/5Z2M0Acg3OT7E8UljLjmc= X-Google-Smtp-Source: ABdhPJwRp23Tcp7DStqEeIUVQutOLb2WR5T9Q1KrYs773Q5FFnrNasoaeqQiUzVYjBNvgbqvFOfAsg== X-Received: by 2002:a17:90a:1656:b0:1bb:f715:5606 with SMTP id x22-20020a17090a165600b001bbf7155606mr8998633pje.221.1645408035199; Sun, 20 Feb 2022 17:47:15 -0800 (PST) Received: from [10.11.37.162] ([103.84.139.53]) by smtp.gmail.com with ESMTPSA id c14sm10171380pfv.126.2022.02.20.17.47.12 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 20 Feb 2022 17:47:14 -0800 (PST) Message-ID: Date: Mon, 21 Feb 2022 09:47:09 +0800 Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Subject: Re: [PATCH] staging: qlge: add unregister_netdev in qlge_probe Content-Language: en-US To: Dan Carpenter Cc: manishc@marvell.com, GR-Linux-NIC-Dev@marvell.com, coiby.xu@gmail.com, gregkh@linuxfoundation.org, netdev@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org References: <20220218081130.45670-1-hbh25y@gmail.com> <20220218120344.GH2407@kadam> From: Hangyu Hua In-Reply-To: <20220218120344.GH2407@kadam> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Thanks for your suggesion. I will resubmit later. On 2022/2/18 20:03, Dan Carpenter wrote: > On Fri, Feb 18, 2022 at 04:11:30PM +0800, Hangyu Hua wrote: >> unregister_netdev need to be called when register_netdev succeeds >> qlge_health_create_reporters fails. >> > > 1) Add a Fixes tag: > > Fixes: d8827ae8e22b ("staging: qlge: deal with the case that devlink_health_reporter_create fails") > >> Signed-off-by: Hangyu Hua >> --- >> drivers/staging/qlge/qlge_main.c | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/staging/qlge/qlge_main.c b/drivers/staging/qlge/qlge_main.c >> index 9873bb2a9ee4..0a199c6d77a1 100644 >> --- a/drivers/staging/qlge/qlge_main.c >> +++ b/drivers/staging/qlge/qlge_main.c >> @@ -4611,8 +4611,10 @@ static int qlge_probe(struct pci_dev *pdev, >> } >> >> err = qlge_health_create_reporters(qdev); >> - if (err) >> + if (err) { >> + unregister_netdev(ndev); >> goto netdev_free; >> + } > > 2) Use a goto to unwind. 3) Release the other pdev stuff as well. > 4) Clean up the error handling for register_netdev() by using a goto > as well. > > err = register_netdev(ndev); > if (err) { > dev_err(&pdev->dev, "net device registration failed.\n"); > goto cleanup_pdev; > } > > err = qlge_health_create_reporters(qdev); > if (err) > goto unregister_netdev; > > ... > > return 0; > > unregister_netdev: > unregister_netdev(ndev); > cleanup_pdev: > qlge_release_all(pdev); > pci_disable_device(pdev); > netdev_free: > free_netdev(ndev); > devlink_free: > devlink_free(devlink); > > return ret; > > regards, > dan carpenter >