Commit a27b5811 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

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: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 4877b19e
...@@ -1616,7 +1616,7 @@ static int atomisp_pci_probe(struct pci_dev *dev, ...@@ -1616,7 +1616,7 @@ static int atomisp_pci_probe(struct pci_dev *dev,
if (!pdata) if (!pdata)
dev_warn(&dev->dev, "no platform data available\n"); dev_warn(&dev->dev, "no platform data available\n");
err = pci_enable_device(dev); err = pcim_enable_device(dev);
if (err) { if (err) {
dev_err(&dev->dev, "Failed to enable CI ISP device (%d)\n", dev_err(&dev->dev, "Failed to enable CI ISP device (%d)\n",
err); err);
...@@ -1907,7 +1907,6 @@ static int atomisp_pci_probe(struct pci_dev *dev, ...@@ -1907,7 +1907,6 @@ static int atomisp_pci_probe(struct pci_dev *dev,
atomisp_msi_irq_uninit(isp, dev); atomisp_msi_irq_uninit(isp, dev);
pci_disable_msi(dev); pci_disable_msi(dev);
enable_msi_fail: enable_msi_fail:
pci_disable_device(dev);
fw_validation_fail: fw_validation_fail:
release_firmware(isp->firmware); release_firmware(isp->firmware);
load_fw_fail: load_fw_fail:
...@@ -1968,8 +1967,6 @@ static void atomisp_pci_remove(struct pci_dev *dev) ...@@ -1968,8 +1967,6 @@ static void atomisp_pci_remove(struct pci_dev *dev)
release_firmware(isp->firmware); release_firmware(isp->firmware);
hmm_pool_unregister(HMM_POOL_TYPE_RESERVED); hmm_pool_unregister(HMM_POOL_TYPE_RESERVED);
pci_disable_device(dev);
} }
static const struct pci_device_id atomisp_pci_tbl[] = { static const struct pci_device_id atomisp_pci_tbl[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment