Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22192ccd authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Linus Torvalds
Browse files

[PATCH] powerpc: Fix ide-pmac sysfs entry 



It looks like the generic ide code now wants ide_init_hwif_ports() to set
the parent struct device into the ide_hw structure (new field ?).  Without
this, the mac ide code can cause the ide probing code to explode in flames
in sysfs registration due to what looks like a stale pointer in there
(happens when removing/re-inserting one of the hotswap media bays on some
laptops).

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c44b20d5

drivers/ide/ppc/pmac.c

+2 −0
Original line number Diff line number Diff line
@@ -553,6 +553,8 @@ pmac_ide_init_hwif_ports(hw_regs_t *hw, 


	if (irq != NULL)

		*irq = pmac_ide[ix].irq;



	hw->dev = &pmac_ide[ix].mdev->ofdev.dev;

}



#define PMAC_IDE_REG(x) ((void __iomem *)(IDE_DATA_REG+(x)))