From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Date: Tue, 12 May 2020 12:07:19 +0000 (+0200)
Subject: media: atomisp: use pcim_enable_device() again
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a27b5811819705910220c70239dd5eec49fefa2d;p=linux.git

media: atomisp: use pcim_enable_device() again

Changing to pci_enable_device() didn't produce the expected
result. It could also eventually led to problems when driver
is removed, due to object lifetime issues. So, let's just
return to the previous behavior.

Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---

diff --git a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
index e83aae1978bdb..36f9b43d31ae0 100644
--- a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
@@ -1616,7 +1616,7 @@ static int atomisp_pci_probe(struct pci_dev *dev,
 	if (!pdata)
 		dev_warn(&dev->dev, "no platform data available\n");
 
-	err = pci_enable_device(dev);
+	err = pcim_enable_device(dev);
 	if (err) {
 		dev_err(&dev->dev, "Failed to enable CI ISP device (%d)\n",
 			err);
@@ -1907,7 +1907,6 @@ initialize_modules_fail:
 	atomisp_msi_irq_uninit(isp, dev);
 	pci_disable_msi(dev);
 enable_msi_fail:
-	pci_disable_device(dev);
 fw_validation_fail:
 	release_firmware(isp->firmware);
 load_fw_fail:
@@ -1968,8 +1967,6 @@ static void atomisp_pci_remove(struct pci_dev *dev)
 	release_firmware(isp->firmware);
 
 	hmm_pool_unregister(HMM_POOL_TYPE_RESERVED);
-
-	pci_disable_device(dev);
 }
 
 static const struct pci_device_id atomisp_pci_tbl[] = {