Commit 96f80219 authored Sep 02, 2008 by Bartlomiej Zolnierkiewicz

ide: fix hwif_to_node()



hwif_to_node() incorrectly assumes that hwif->dev always belongs to
a PCI device.  This results in ide-cs oopsing in init_irq() after
commit c56c5648 accidentally fixed
device tree registration for ide-cs.  Fix it by using dev_to_node().

Thanks to Martin Michlmayr and Larry Finger for help with debugging
the issue.

Reported-by: Martin Michlmayr <tbm@cyrius.com>
Tested-by: Martin Michlmayr <tbm@cyrius.com>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

parent a1aee862

include/linux/ide.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -1448,8 +1448,7 @@ static inline void ide_dump_identify(u8 *id)

		static inline int hwif_to_node(ide_hwif_t *hwif)
		{
		struct pci_dev *dev = to_pci_dev(hwif->dev);
		return hwif->dev ? pcibus_to_node(dev->bus) : -1;
		return hwif->dev ? dev_to_node(hwif->dev) : -1;
		}

		static inline ide_drive_t ide_get_paired_drive(ide_drive_t drive)