Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp329687ybi; Fri, 7 Jun 2019 08:43:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqz7OxtFFUoTviKPPF/bUJSL8PD7/yOsf01J37856/YDOh0SpgQFsHEVmRZxSGI4lIxUCS8F X-Received: by 2002:a62:ed0a:: with SMTP id u10mr27329182pfh.243.1559922238055; Fri, 07 Jun 2019 08:43:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559922238; cv=none; d=google.com; s=arc-20160816; b=Ye3GVy41Ms0pXOi0HbIunRnHzUR6yxtdyV/QS1e8FNKH01eUYA0ETMpHEB3MK3v49I DdulduSqFLUtOxZyr1VcMlWh/mG9wcE3tRej2FzkdVWoSjIpfJO7kMRnk2hYKBcvuR/O 1/pKOB44LOL5i5gdmy6Db3HtO5JZcPgNfQOeKv38jQynh+umfK6Tujy5UyQu9d7XyQv/ tEUot67dEbvWIfryyIhRrh4v+VRLCCuagKe/l1wRkv0ibCyIMYm9tKtqFfUDL6r2xBEC 2O7mq78QO1AVsaBPccq1lj57j0N7kDqauOZpGy3fMKtqmLnqHI5BAH2vb0d4eIr4BrR4 Dxtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=webR5zfEKsx5tdueiDdx74qMPLrqHzrWts5dFMZWD94=; b=RWxaZTO+V8NcYApZqLCFnQl6V4/VaL1EBgmOxsoK4w7yWpGAitj7P4lXKh7ZO15o2a pZW7QMt7nX5ga9BdZmyeFZABCZ6Wkld9jocNP9367iiupTVappnuQzYmCz0/2Vs8++lD w7OigA6B9YUe8NHic7wnOAEvGavaojbdsCM6rRzzl68iviPd8IqAjooy7ZQoSfrT4PKh T6KQtrFF8SHbb/1G1rQ1d7w5t4LQTrPA7JlhuQHKMHJQxrIyXIY2XuI+bm56suL6Cfui t8jJrWgRn4d6zCwOr4DxiPaRLPT3eGa3nxddthcAUrb3tL8noOn8A7mjiif5rUYglEPU 7S/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=TvH9NiXz; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s12si2174807plp.63.2019.06.07.08.43.41; Fri, 07 Jun 2019 08:43:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=TvH9NiXz; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730097AbfFGPkk (ORCPT + 99 others); Fri, 7 Jun 2019 11:40:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:49940 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730062AbfFGPkh (ORCPT ); Fri, 7 Jun 2019 11:40:37 -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 985D420840; Fri, 7 Jun 2019 15:40:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559922037; bh=ESRl4YNnZZ8EBLT9NQ4ra1n7A9/hq/4DhFx8XybXgcI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TvH9NiXzlj4WtB1aJNHDC7t0eRw/+qV2IoWUibp2yXq/EXcA3zVuQsOFaGgW0DjXu JyyVtoQdwKy9DnHW9ceSq+NyiGIJJ9NiTySWtJd3K+maxbCKHSCY0D8tLfpUkvTcQR qGcCzHd9NNxE7QclEdZ5LJdFSiMM0DbduUmm+2oE= 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.14 14/69] net: mvneta: Fix err code path of probe Date: Fri, 7 Jun 2019 17:38:55 +0200 Message-Id: <20190607153850.054806461@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190607153848.271562617@linuxfoundation.org> References: <20190607153848.271562617@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 @@ -4350,7 +4350,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, @@ -4369,13 +4369,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);