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=-6.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,USER_AGENT_GIT autolearn=unavailable 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 C5FEEC28EBD for ; Sun, 9 Jun 2019 17:17:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8FB9F2067C for ; Sun, 9 Jun 2019 17:17:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560100652; bh=uae2xRWchcWYJuU0fTF1cvW/NGTVmHrqAquGYK8xW7o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xwKR4slFgHHjOwzdGiLKgyUXlGgGeUk8xAXhVlV0vh00nyEbm9AkboGicP0wMXLSy LeYmGi8D0hDrS37eYDIf40jqEc3YnPUyuQ4Zim2XG+gpY24C95iq+rdzrPyo0zc5Rn gD0g+cor1hvtGgcV//LW1Uccal4wJ41VuIm/QTEE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732026AbfFIQvr (ORCPT ); Sun, 9 Jun 2019 12:51:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:52220 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732007AbfFIQvq (ORCPT ); Sun, 9 Jun 2019 12:51:46 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 B2ACB205ED; Sun, 9 Jun 2019 16:51:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560099106; bh=uae2xRWchcWYJuU0fTF1cvW/NGTVmHrqAquGYK8xW7o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZmJaY1FZZwv6pAfLVr0vGaN8JgJQ6JPbMXK1T8Tgis2Lbb9jKvXOT91QTZSa9i8DV OvlmxvIZUKPih4gUsz7jgxg9q/W9Pa1TLu7QTrpbMG0bYpTUEX7nHFZH4Pcu4kYZHH Qk6khqo9bWzBowtehzE/2q2NQWopdJOiT5gs77Gs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jisheng Zhang , "David S. Miller" Subject: [PATCH 4.9 12/83] net: mvneta: Fix err code path of probe Date: Sun, 9 Jun 2019 18:41:42 +0200 Message-Id: <20190609164128.584652321@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190609164127.843327870@linuxfoundation.org> References: <20190609164127.843327870@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jisheng Zhang [ Upstream commit d484e06e25ebb937d841dac02ac1fe76ec7d4ddd ] Fix below issues in err code path of probe: 1. we don't need to unregister_netdev() because the netdev isn't registered. 2. when register_netdev() fails, we also need to destroy bm pool for HWBM case. Fixes: dc35a10f68d3 ("net: mvneta: bm: add support for hardware buffer management") Signed-off-by: Jisheng Zhang Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/marvell/mvneta.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -4162,7 +4162,7 @@ static int mvneta_probe(struct platform_ err = register_netdev(dev); if (err < 0) { dev_err(&pdev->dev, "failed to register\n"); - goto err_free_stats; + goto err_netdev; } netdev_info(dev, "Using %s mac address %pM\n", mac_from, @@ -4181,13 +4181,11 @@ static int mvneta_probe(struct platform_ return 0; err_netdev: - unregister_netdev(dev); if (pp->bm_priv) { mvneta_bm_pool_destroy(pp->bm_priv, pp->pool_long, 1 << pp->id); mvneta_bm_pool_destroy(pp->bm_priv, pp->pool_short, 1 << pp->id); } -err_free_stats: free_percpu(pp->stats); err_free_ports: free_percpu(pp->ports);