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 <[EMAIL PROTECTED]>
Index: bu3sch-wireless-dev/drivers/net/b44.c
===================================================================
--- bu3sch-wireless-dev.orig/drivers/net/b44.c 2007-05-28 00:30:00.000000000
+0200
+++ bu3sch-wireless-dev/drivers/net/b44.c 2007-05-28 00:31:32.000000000
+0200
@@ -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)
--
Greetings Michael.
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
