From: Michael Buesch This fixes a bug introduced by me with the ssb porting. A u32 integer is casted to a u16* pointer, which is gonna break, obviously. Signed-off-by: Michael Buesch Cc: John Linville Cc: Gary Zambrano Signed-off-by: Andrew Morton --- drivers/net/b44.c | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) diff -puN drivers/net/b44.c~b44-ssb-fix-an-invalid-pointer-casting drivers/net/b44.c --- a/drivers/net/b44.c~b44-ssb-fix-an-invalid-pointer-casting +++ a/drivers/net/b44.c @@ -1568,6 +1568,22 @@ static void b44_setup_pseudo_magicp(stru } +#ifdef CONFIG_B44_PCI +static void b44_setup_wol_pci(struct b44 *bp) +{ + u16 val; + + if (bp->sdev->bus->bustype != SSB_BUSTYPE_SSB) { + val = br32(bp, SSB_TMSLOW); + bw32(bp, SSB_TMSLOW, val | SSB_TMSLOW_PE); + pci_read_config_word(bp->sdev->bus->host_pci, SSB_PMCSR, &val); + pci_write_config_word(bp->sdev->bus->host_pci, SSB_PMCSR, val | SSB_PE); + } +} +#else +static inline void b44_setup_wol_pci(struct b44 *bp) { } +#endif /* CONFIG_B44_PCI */ + static void b44_setup_wol(struct b44 *bp) { u32 val; @@ -1594,15 +1610,7 @@ static void b44_setup_wol(struct b44 *bp } else { b44_setup_pseudo_magicp(bp); } - -#ifdef CONFIG_B44_PCI - if (bp->sdev->bus->bustype != SSB_BUSTYPE_SSB) { - val = br32(bp, SSB_TMSLOW); - bw32(bp, SSB_TMSLOW, val | SSB_TMSLOW_PE); - } - pci_read_config_word(bp->sdev->bus->host_pci, SSB_PMCSR, (u16 *)(&val)); - pci_write_config_word(bp->sdev->bus->host_pci, SSB_PMCSR, val | SSB_PE); -#endif /* CONFIG_B44_PCI */ + b44_setup_wol_pci(bp); } static int b44_close(struct net_device *dev) _