mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
[PATCH] IOC3/IOC4: PCI mem space resources
The SGI IOC3 and IOC4 PCI devices implement memory space apertures, not I/O space apertures. Use the appropriate region management functions. Signed-off-by: Brent Casavant <[email protected]> Cc: Pat Gefre <[email protected]> Cc: Stanislaw Skowronek <[email protected]> Cc: Brent Casavant <[email protected]> Acked-by: Ralf Baechle <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
24fa509614
commit
52c9ae0ac7
3 changed files with 9 additions and 9 deletions
|
|
@ -654,7 +654,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
|
|||
ret = -ENODEV;
|
||||
goto out_pci;
|
||||
}
|
||||
if (!request_region(idd->pma, IOC3_PCI_SIZE, "ioc3")) {
|
||||
if (!request_mem_region(idd->pma, IOC3_PCI_SIZE, "ioc3")) {
|
||||
printk(KERN_WARNING
|
||||
"%s: Unable to request IOC3 region "
|
||||
"for pci_dev %s.\n",
|
||||
|
|
@ -744,7 +744,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
|
|||
return 0;
|
||||
|
||||
out_misc_region:
|
||||
release_region(idd->pma, IOC3_PCI_SIZE);
|
||||
release_mem_region(idd->pma, IOC3_PCI_SIZE);
|
||||
out_pci:
|
||||
kfree(idd);
|
||||
out_idd:
|
||||
|
|
@ -785,7 +785,7 @@ static void ioc3_remove(struct pci_dev *pdev)
|
|||
if(idd->dual_irq)
|
||||
free_irq(idd->irq_eth, (void *)idd);
|
||||
iounmap(idd->vma);
|
||||
release_region(idd->pma, IOC3_PCI_SIZE);
|
||||
release_mem_region(idd->pma, IOC3_PCI_SIZE);
|
||||
|
||||
/* Disable IOC3 and relinquish */
|
||||
pci_disable_device(pdev);
|
||||
|
|
|
|||
Loading…
Reference in a new issue