diff options
Diffstat (limited to 'drivers/message/i2o/pci.c')
-rw-r--r-- | drivers/message/i2o/pci.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/message/i2o/pci.c b/drivers/message/i2o/pci.c index c5b656cdea7c..d698d7709c31 100644 --- a/drivers/message/i2o/pci.c +++ b/drivers/message/i2o/pci.c | |||
@@ -88,11 +88,6 @@ static int __devinit i2o_pci_alloc(struct i2o_controller *c) | |||
88 | struct device *dev = &pdev->dev; | 88 | struct device *dev = &pdev->dev; |
89 | int i; | 89 | int i; |
90 | 90 | ||
91 | if (pci_request_regions(pdev, OSM_DESCRIPTION)) { | ||
92 | printk(KERN_ERR "%s: device already claimed\n", c->name); | ||
93 | return -ENODEV; | ||
94 | } | ||
95 | |||
96 | for (i = 0; i < 6; i++) { | 91 | for (i = 0; i < 6; i++) { |
97 | /* Skip I/O spaces */ | 92 | /* Skip I/O spaces */ |
98 | if (!(pci_resource_flags(pdev, i) & IORESOURCE_IO)) { | 93 | if (!(pci_resource_flags(pdev, i) & IORESOURCE_IO)) { |
@@ -319,6 +314,11 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev, | |||
319 | return rc; | 314 | return rc; |
320 | } | 315 | } |
321 | 316 | ||
317 | if (pci_request_regions(pdev, OSM_DESCRIPTION)) { | ||
318 | printk(KERN_ERR "i2o: device already claimed\n"); | ||
319 | return -ENODEV; | ||
320 | } | ||
321 | |||
322 | if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) { | 322 | if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) { |
323 | printk(KERN_WARNING "i2o: no suitable DMA found for %s\n", | 323 | printk(KERN_WARNING "i2o: no suitable DMA found for %s\n", |
324 | pci_name(pdev)); | 324 | pci_name(pdev)); |