Commit 462502ff authored by Stefan Raspl's avatar Stefan Raspl Committed by David S. Miller

net/ism: Add missing calls to disable bus-mastering

Signed-off-by: default avatarStefan Raspl <raspl@linux.ibm.com>
Signed-off-by: default avatarJan Karcher <jaka@linux.ibm.com>
Signed-off-by: default avatarWenjia Zhang <wenjia@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c40bff41
...@@ -582,6 +582,7 @@ static int ism_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -582,6 +582,7 @@ static int ism_probe(struct pci_dev *pdev, const struct pci_device_id *id)
err_free: err_free:
smcd_free_dev(ism->smcd); smcd_free_dev(ism->smcd);
err_resource: err_resource:
pci_clear_master(pdev);
pci_release_mem_regions(pdev); pci_release_mem_regions(pdev);
err_disable: err_disable:
pci_disable_device(pdev); pci_disable_device(pdev);
...@@ -612,6 +613,7 @@ static void ism_remove(struct pci_dev *pdev) ...@@ -612,6 +613,7 @@ static void ism_remove(struct pci_dev *pdev)
ism_dev_exit(ism); ism_dev_exit(ism);
smcd_free_dev(ism->smcd); smcd_free_dev(ism->smcd);
pci_clear_master(pdev);
pci_release_mem_regions(pdev); pci_release_mem_regions(pdev);
pci_disable_device(pdev); pci_disable_device(pdev);
dev_set_drvdata(&pdev->dev, NULL); dev_set_drvdata(&pdev->dev, NULL);
......
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