diff options
| author | Bartlomiej Zolnierkiewicz <b.zolnierkiewicz@elka.pw.edu.pl> | 2003-08-30 22:16:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2003-08-30 22:16:54 -0700 |
| commit | a64e02a655ee3787ff807b4a526ae14494eb62ff (patch) | |
| tree | e2fed0e412affb14c4e93757f6fdfb74969f1475 | |
| parent | b9d9a993a7a6dd597d7fd17489f10a30c999e288 (diff) | |
[PATCH] allow drivers (ie. mediabay) to set hwif->gendev.parent
From Benjamin Herrenschmidt <benh@kernel.crashing.org>.
| -rw-r--r-- | drivers/ide/ide-probe.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index e95cf073e345..abe3fbb96659 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c @@ -649,10 +649,13 @@ static void hwif_register (ide_hwif_t *hwif) /* register with global device tree */ strlcpy(hwif->gendev.bus_id,hwif->name,BUS_ID_SIZE); hwif->gendev.driver_data = hwif; - if (hwif->pci_dev) - hwif->gendev.parent = &hwif->pci_dev->dev; - else - hwif->gendev.parent = NULL; /* Would like to do = &device_legacy */ + if (hwif->gendev.parent == NULL) { + if (hwif->pci_dev) + hwif->gendev.parent = &hwif->pci_dev->dev; + else + /* Would like to do = &device_legacy */ + hwif->gendev.parent = NULL; + } device_register(&hwif->gendev); } |