diff options
Diffstat (limited to 'drivers/message/i2o/pci.c')
-rw-r--r-- | drivers/message/i2o/pci.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/message/i2o/pci.c b/drivers/message/i2o/pci.c index 329d482eee81..c5b656cdea7c 100644 --- a/drivers/message/i2o/pci.c +++ b/drivers/message/i2o/pci.c | |||
@@ -339,7 +339,7 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev, | |||
339 | pci_name(pdev)); | 339 | pci_name(pdev)); |
340 | 340 | ||
341 | c->pdev = pdev; | 341 | c->pdev = pdev; |
342 | c->device.parent = get_device(&pdev->dev); | 342 | c->device.parent = &pdev->dev; |
343 | 343 | ||
344 | /* Cards that fall apart if you hit them with large I/O loads... */ | 344 | /* Cards that fall apart if you hit them with large I/O loads... */ |
345 | if (pdev->vendor == PCI_VENDOR_ID_NCR && pdev->device == 0x0630) { | 345 | if (pdev->vendor == PCI_VENDOR_ID_NCR && pdev->device == 0x0630) { |
@@ -410,8 +410,6 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev, | |||
410 | if ((rc = i2o_iop_add(c))) | 410 | if ((rc = i2o_iop_add(c))) |
411 | goto uninstall; | 411 | goto uninstall; |
412 | 412 | ||
413 | get_device(&c->device); | ||
414 | |||
415 | if (i960) | 413 | if (i960) |
416 | pci_write_config_word(i960, 0x42, 0x03ff); | 414 | pci_write_config_word(i960, 0x42, 0x03ff); |
417 | 415 | ||
@@ -424,7 +422,6 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev, | |||
424 | i2o_pci_free(c); | 422 | i2o_pci_free(c); |
425 | 423 | ||
426 | free_controller: | 424 | free_controller: |
427 | put_device(c->device.parent); | ||
428 | i2o_iop_free(c); | 425 | i2o_iop_free(c); |
429 | 426 | ||
430 | disable: | 427 | disable: |
@@ -454,7 +451,6 @@ static void __devexit i2o_pci_remove(struct pci_dev *pdev) | |||
454 | 451 | ||
455 | printk(KERN_INFO "%s: Controller removed.\n", c->name); | 452 | printk(KERN_INFO "%s: Controller removed.\n", c->name); |
456 | 453 | ||
457 | put_device(c->device.parent); | ||
458 | put_device(&c->device); | 454 | put_device(&c->device); |
459 | }; | 455 | }; |
460 | 456 | ||