Received: by 2002:a05:6a10:c7c6:0:0:0:0 with SMTP id h6csp1659175pxy; Mon, 2 Aug 2021 07:15:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJydFZymKdhneQ+2ySk+j4SstbGLrnkxfQruNvqfe2/no9ZAIHm+9vbdbAZzs+ML7roT2hcT X-Received: by 2002:a05:6638:44f:: with SMTP id r15mr15089516jap.55.1627913740684; Mon, 02 Aug 2021 07:15:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627913740; cv=none; d=google.com; s=arc-20160816; b=z9gHp2tVeIAU3FLUg1Cj925/LZACceSQh1wtaGHY6OIPO9ZeiDhei/zd82AIzsYocw Hmg46AMS1HQ3yAn9ZQE3HB7FEP9ekVSPWz72qPdCpKu3FYtydmQY/gATIp1N5RERIqAX huRA5fsSG9U2B8LVYoLSaj+CBKI3wUH2YzV+YU56XNxsnKKm1N0y9yx/+qk4btFWbp+G cTjK8EtIrDJX2O6ouDSqIowIWe6p0cx2NxBBihJtgsyEMOpYI85DtKMpNLERsh+VuosB qkEgdu42NGLyjRQQI3Aw0S4wPA0wydaFI9zbL3QN9z29HZVV2ZcaLPmvHtSkT05d64Uo fruQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=lllnB295twEvz0EIvwu/CLfrpfuKcpfiDR3LCiAPK2s=; b=kfNMvia7aEiz/9pRuCeKK3GryLxK20Ok4EtJE1YDONZAcyhvtFxI2ckDg1x9oRmfVz upBDjpP04jeIAVriKMN/9WztV493cjO13JsIKI7h7NL8eYqCHasQIjPSTRKP10jS3/n3 /xMmymPaQUsbrMHN3gkkHrcu0KIcw0ehsFjSJvXI0MYyHJldEj4g79ZuWfjgCKk5Qg3B 1+8Y8Bscabk9M4J8X6r+Ic5qeFRZcIlCwwMsjzr7wCUkfr5T4plDuB2Vbxlef9LIqSK+ 7jk0rkvyC7bcUaCK/NmJ/HXeMc71CTxjCJXgFXfNyzmLffK1sKLZE4ldYGnZVg6S08qh Xelw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=OrNZInCV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g2si14246339jat.88.2021.08.02.07.15.27; Mon, 02 Aug 2021 07:15:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=OrNZInCV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237886AbhHBOOS (ORCPT + 99 others); Mon, 2 Aug 2021 10:14:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:47240 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236389AbhHBOEK (ORCPT ); Mon, 2 Aug 2021 10:04:10 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BEF6C61029; Mon, 2 Aug 2021 13:57:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1627912664; bh=RpHi/N2fpE+anUQgI6rQ0fkw0FuwGVwHthESk42mFLE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OrNZInCVNvFdi+heKdMNFxqsOm9BGOYjSNUK5EYsYGkdbMRygszlbIbP3OdBY95I1 De50HRjw4Mi1AAtvPLDGenoltvTJ+OdlbJr71lnSe62j+GM493khgJzz1e71oKDwx7 CFtgCJZgALS5KbNiRi5DFxPvCylU3NpvoEWXcGPI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Wang Hai , "David S. Miller" , Sasha Levin Subject: [PATCH 5.13 088/104] tulip: windbond-840: Fix missing pci_disable_device() in probe and remove Date: Mon, 2 Aug 2021 15:45:25 +0200 Message-Id: <20210802134346.914025849@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210802134344.028226640@linuxfoundation.org> References: <20210802134344.028226640@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: linux-kernel@vger.kernel.org From: Wang Hai [ Upstream commit 76a16be07b209a3f507c72abe823bd3af1c8661a ] Replace pci_enable_device() with pcim_enable_device(), pci_disable_device() and pci_release_regions() will be called in release automatically. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Reported-by: Hulk Robot Signed-off-by: Wang Hai Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/dec/tulip/winbond-840.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c index 514df170ec5d..c967e0e859e5 100644 --- a/drivers/net/ethernet/dec/tulip/winbond-840.c +++ b/drivers/net/ethernet/dec/tulip/winbond-840.c @@ -357,7 +357,7 @@ static int w840_probe1(struct pci_dev *pdev, const struct pci_device_id *ent) int i, option = find_cnt < MAX_UNITS ? options[find_cnt] : 0; void __iomem *ioaddr; - i = pci_enable_device(pdev); + i = pcim_enable_device(pdev); if (i) return i; pci_set_master(pdev); @@ -379,7 +379,7 @@ static int w840_probe1(struct pci_dev *pdev, const struct pci_device_id *ent) ioaddr = pci_iomap(pdev, TULIP_BAR, netdev_res_size); if (!ioaddr) - goto err_out_free_res; + goto err_out_netdev; for (i = 0; i < 3; i++) ((__le16 *)dev->dev_addr)[i] = cpu_to_le16(eeprom_read(ioaddr, i)); @@ -458,8 +458,6 @@ static int w840_probe1(struct pci_dev *pdev, const struct pci_device_id *ent) err_out_cleardev: pci_iounmap(pdev, ioaddr); -err_out_free_res: - pci_release_regions(pdev); err_out_netdev: free_netdev (dev); return -ENODEV; @@ -1526,7 +1524,6 @@ static void w840_remove1(struct pci_dev *pdev) if (dev) { struct netdev_private *np = netdev_priv(dev); unregister_netdev(dev); - pci_release_regions(pdev); pci_iounmap(pdev, np->base_addr); free_netdev(dev); } -- 2.30.2