aboutsummaryrefslogtreecommitdiff
path: root/drivers/ide
diff options
context:
space:
mode:
authorChristoph Lameter <christoph@lameter.com>2005-08-09 19:59:21 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-09 20:21:31 -0700
commit86b3786078d63242d3194ffc58ae8dae1d1bbef3 (patch)
tree518f62158f0923573decb8f072ac7282fb7575cb /drivers/ide
parentaeb3f76350e78aba90653b563de6677b442d21d6 (diff)
[PATCH] Fix ide-disk.c oops caused by hwif == NULL
1. Move hwif_to_node to ide.h 2. Use hwif_to_node in ide-disk.c Signed-off-by: Christoph Lameter <clameter@sgi.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/ide-disk.c2
-rw-r--r--drivers/ide/ide-probe.c9
2 files changed, 1 insertions, 10 deletions
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index f9c1acb4ed6..c9d3a00a3c0 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -1220,7 +1220,7 @@ static int ide_disk_probe(struct device *dev)
goto failed;
g = alloc_disk_node(1 << PARTN_BITS,
- pcibus_to_node(drive->hwif->pci_dev->bus));
+ hwif_to_node(drive->hwif));
if (!g)
goto out_free_idkp;
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 94daf40ae32..c1128ae5cd2 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -960,15 +960,6 @@ static void save_match(ide_hwif_t *hwif, ide_hwif_t *new, ide_hwif_t **match)
}
#endif /* MAX_HWIFS > 1 */
-static inline int hwif_to_node(ide_hwif_t *hwif)
-{
- if (hwif->pci_dev)
- return pcibus_to_node(hwif->pci_dev->bus);
- else
- /* Add ways to determine the node of other busses here */
- return -1;
-}
-
/*
* init request queue
*/