aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-probe.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/ide-probe.c')
-rw-r--r--drivers/ide/ide-probe.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 291dacee52ef..7576a902a6a0 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -641,14 +641,9 @@ static int ide_register_port(ide_hwif_t *hwif)
641 /* register with global device tree */ 641 /* register with global device tree */
642 dev_set_name(&hwif->gendev, hwif->name); 642 dev_set_name(&hwif->gendev, hwif->name);
643 hwif->gendev.driver_data = hwif; 643 hwif->gendev.driver_data = hwif;
644 if (hwif->gendev.parent == NULL) { 644 hwif->gendev.parent = hwif->dev;
645 if (hwif->dev)
646 hwif->gendev.parent = hwif->dev;
647 else
648 /* Would like to do = &device_legacy */
649 hwif->gendev.parent = NULL;
650 }
651 hwif->gendev.release = hwif_release_dev; 645 hwif->gendev.release = hwif_release_dev;
646
652 ret = device_register(&hwif->gendev); 647 ret = device_register(&hwif->gendev);
653 if (ret < 0) { 648 if (ret < 0) {
654 printk(KERN_WARNING "IDE: %s: device_register error: %d\n", 649 printk(KERN_WARNING "IDE: %s: device_register error: %d\n",