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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 E21A6C43381 for ; Fri, 22 Mar 2019 11:49:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B211321929 for ; Fri, 22 Mar 2019 11:49:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553255356; bh=+ZClKKdZNAa4RdHi5Vj3MpRWdacva4y8KH0Dn3ohexg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=V9qUF21r0TM05ETZnipUAc7Lr+GS/bSHhcDSfT6LSRGVbjzjwembfltmgWcU3BX3E Znc94gMRr6Emjcyoi57KSsU79nwgchk1ILUDPcFi+5mlQ14ankPJhB6ZprOqAlszMz yCafANz5m4zK8kCzJWtWpXGMDIUI5hrzvucIoGUk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732245AbfCVLtP (ORCPT ); Fri, 22 Mar 2019 07:49:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:52816 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732226AbfCVLtN (ORCPT ); Fri, 22 Mar 2019 07:49:13 -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 2B2E721929; Fri, 22 Mar 2019 11:49:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553255352; bh=+ZClKKdZNAa4RdHi5Vj3MpRWdacva4y8KH0Dn3ohexg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j4e0/hueRLhpEpQw2vzl5FEmnXHzP+wBfMNQxyQdINgg13GWB/4dvkWSn6ZUKuPTQ mzA4Vi+b/PDSijig4N1P/eNgiZZyUgGJ9zwS2XXOPZC8G20hU7aG1E0kF4GfMkMz6G bg8GxU2EYSxffX4INO6pWepUCJDGecZ40IMRocxs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mao Wenan , "David S. Miller" , Sasha Levin Subject: [PATCH 4.14 064/183] net: set static variable an initial value in atl2_probe() Date: Fri, 22 Mar 2019 12:14:52 +0100 Message-Id: <20190322111246.345094512@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111241.819468003@linuxfoundation.org> References: <20190322111241.819468003@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 4593403fa516a5a4cffe6883c5062d60932cbfbe ] cards_found is a static variable, but when it enters atl2_probe(), cards_found is set to zero, the value is not consistent with last probe, so next behavior is not our expect. Signed-off-by: Mao Wenan Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/atheros/atlx/atl2.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c index 77a1c03255de..225b4d452e0e 100644 --- a/drivers/net/ethernet/atheros/atlx/atl2.c +++ b/drivers/net/ethernet/atheros/atlx/atl2.c @@ -1334,13 +1334,11 @@ static int atl2_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { struct net_device *netdev; struct atl2_adapter *adapter; - static int cards_found; + static int cards_found = 0; unsigned long mmio_start; int mmio_len; int err; - cards_found = 0; - err = pci_enable_device(pdev); if (err) return err; -- 2.19.1