diff options
author | Christoph Lameter <christoph@lameter.com> | 2005-08-09 19:59:21 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-09 20:21:31 -0700 |
commit | 86b3786078d63242d3194ffc58ae8dae1d1bbef3 (patch) | |
tree | 518f62158f0923573decb8f072ac7282fb7575cb /include/linux/ide.h | |
parent | aeb3f76350e78aba90653b563de6677b442d21d6 (diff) | |
download | linux-86b3786078d63242d3194ffc58ae8dae1d1bbef3.tar.gz linux-86b3786078d63242d3194ffc58ae8dae1d1bbef3.tar.bz2 linux-86b3786078d63242d3194ffc58ae8dae1d1bbef3.zip |
[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 'include/linux/ide.h')
-rw-r--r-- | include/linux/ide.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 92129078d4f3..a6dbb51ecd7b 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -1501,4 +1501,10 @@ extern struct bus_type ide_bus_type; #define ide_id_has_flush_cache_ext(id) \ (((id)->cfs_enable_2 & 0x2400) == 0x2400) +static inline int hwif_to_node(ide_hwif_t *hwif) +{ + struct pci_dev *dev = hwif->pci_dev; + return dev ? pcibus_to_node(dev->bus) : -1; +} + #endif /* _IDE_H */ |