Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp3602813pxt; Tue, 10 Aug 2021 07:17:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxIAIZLtJBhGlaYoBQtPCN0H/rLog3esMiiJkppMGBs/kwfUWcXhXZ5E162MYS1KdcnwVyX X-Received: by 2002:a05:6402:408:: with SMTP id q8mr5241512edv.13.1628605052200; Tue, 10 Aug 2021 07:17:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628605052; cv=none; d=google.com; s=arc-20160816; b=z4ynWH5NW5J3KNuuh9ZBIWsH3v0ZTIDVQFXV9hea0+F6o2VdWpD1iAdDK24xLFWdtE Al+c2xpLkYvT8ce+yGCh5z8d/Zirkr0Qma6zjqaBd4Q6DDAELbPG3dvU0Iyke06PqLuP s1MJogLEchsKZSRw3ZGm5utlMr08LZfA8+hU6lhkgG6z2YQN6VugWHQB1iXYvZItP4jz ossMKICHsaGvGMuCDnpRlxtQS0XvrI5jTbWXO7zMkwAW6DAFy6oGdpK4QkGikwHgrbzX /ArgBta6MrU2y1vY29JHRkGi3o8HmR/j/BNxtlldnPBqUtXxdJtYUptGFteLE8BJzIWl PSOg== 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 :message-id:date:subject:cc:to:from; bh=VoRN4Jkrt2jtEx4z/87gufGzwXuTFklV2grTRCndu30=; b=GQ+xoClqA/kF1V8XiYffo9L9UeMdMlEpodF02vM+xcoyVztTaJkYwmtGmmuL08LC/R RS7wn0gNpIr1A88FQQ+xs0nG7ACnuiLV5IWjrzVvkRj5AnL7Qj6GjbXYEzJCeomoTIgR ZXYTbz5YqpqyN5XIgIvvBwXTbw/i/jZ6WMHzo6IxmWyip1b936k1gSx6eNd9PCkESeus dKxLCy2Z8ins5b9iadZ4LKVMdDukIS7gpzxup6MOf5Vre3OL763tlFMdPWvocG1Pk6Ji pVuPslJLqzh4rNMbI5QdU33TlLVU8o2aRP7RrCrQG17qx1C/Qh8L4tli48jEql4kAEkK zTxQ== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bl4si25554333ejb.689.2021.08.10.07.17.08; Tue, 10 Aug 2021 07:17:32 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240905AbhHJMtY (ORCPT + 99 others); Tue, 10 Aug 2021 08:49:24 -0400 Received: from szxga02-in.huawei.com ([45.249.212.188]:8391 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240877AbhHJMtX (ORCPT ); Tue, 10 Aug 2021 08:49:23 -0400 Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.57]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4GkXjC0Ckjz828j; Tue, 10 Aug 2021 20:45:03 +0800 (CST) Received: from dggpeml500017.china.huawei.com (7.185.36.243) by dggemv703-chm.china.huawei.com (10.3.19.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Tue, 10 Aug 2021 20:48:59 +0800 Received: from huawei.com (10.175.103.91) by dggpeml500017.china.huawei.com (7.185.36.243) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Tue, 10 Aug 2021 20:48:58 +0800 From: Yang Yingliang To: , CC: , Subject: [PATCH -next] ptp: ocp: Fix missing pci_disable_device() on error in ptp_ocp_probe() Date: Tue, 10 Aug 2021 20:54:53 +0800 Message-ID: <20210810125453.2182835-1-yangyingliang@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.103.91] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpeml500017.china.huawei.com (7.185.36.243) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If ptp_ocp_device_init() fails, pci_disable_device() need be called, fix this by using pcim_enable_device(). Reported-by: Hulk Robot Signed-off-by: Yang Yingliang --- drivers/ptp/ptp_ocp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/ptp/ptp_ocp.c b/drivers/ptp/ptp_ocp.c index 92edf772feed..04cce8d3b1f6 100644 --- a/drivers/ptp/ptp_ocp.c +++ b/drivers/ptp/ptp_ocp.c @@ -1429,7 +1429,7 @@ ptp_ocp_probe(struct pci_dev *pdev, const struct pci_device_id *id) if (err) goto out_free; - err = pci_enable_device(pdev); + err = pcim_enable_device(pdev); if (err) { dev_err(&pdev->dev, "pci_enable_device\n"); goto out_unregister; @@ -1476,7 +1476,6 @@ ptp_ocp_probe(struct pci_dev *pdev, const struct pci_device_id *id) out: ptp_ocp_detach(bp); - pci_disable_device(pdev); pci_set_drvdata(pdev, NULL); out_unregister: devlink_unregister(devlink); @@ -1493,7 +1492,6 @@ ptp_ocp_remove(struct pci_dev *pdev) struct devlink *devlink = priv_to_devlink(bp); ptp_ocp_detach(bp); - pci_disable_device(pdev); pci_set_drvdata(pdev, NULL); devlink_unregister(devlink); -- 2.25.1