Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 09:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

NVMe: Enable and disable the PCI device

Browse Source 
Call pci_enable_device_mem() at initialisation and pci_disable_device
at exit.

Signed-off-by: Shane Michael Matthews <shane.matthews@intel.com>
Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
This commit is contained in:
Shane Michael Matthews 2011-02-01 08:49:30 -05:00 committed by Matthew Wilcox
parent 3f85d50b60
commit 0ee5a7d7cb
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/block/nvme.c
View File

@ -1103,6 +1103,9 @@ static int __devinit nvme_probe(struct pci_dev *pdev,
if (!dev->queues)
goto free;
if (pci_enable_device_mem(pdev))
goto free;
INIT_LIST_HEAD(&dev->namespaces);
dev->pci_dev = pdev;
pci_set_drvdata(pdev, dev);
@ -1133,6 +1136,7 @@ static int __devinit nvme_probe(struct pci_dev *pdev,
disable:
pci_disable_msix(pdev);
nvme_release_instance(dev);
pci_disable_device(pdev);
free:
kfree(dev->queues);
kfree(dev->entry);
@ -1147,6 +1151,7 @@ static void __devexit nvme_remove(struct pci_dev *pdev)
pci_disable_msix(pdev);
iounmap(dev->bar);
nvme_release_instance(dev);
pci_disable_device(pdev);
kfree(dev->queues);
kfree(dev->entry);
kfree(dev);