From 66a91ff533b6e0dcf0c35bbec87d26de25df11c3 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Mon, 23 Nov 2009 18:42:36 -0600
Subject: [PATCH] --- yaml --- r: 172235 b: refs/heads/master c:
 316a4d966cae3c2dec83ebb1ee1a3515f97b30ff h: refs/heads/master i:   172233:
 f17179894d7357953ade333063fb7194e8c3df2d   172231:
 ea37f365ee40b5567ed41bbe8004f4e740e23368 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/wireless/b43legacy/rfkill.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 929ff5f1463e..f388eb08c382 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2ff581acab16c6af56d9e8c1a579bf041ec00b1
+refs/heads/master: 316a4d966cae3c2dec83ebb1ee1a3515f97b30ff
diff --git a/trunk/drivers/net/wireless/b43legacy/rfkill.c b/trunk/drivers/net/wireless/b43legacy/rfkill.c
index 8783022db11e..d579df72b783 100644
--- a/trunk/drivers/net/wireless/b43legacy/rfkill.c
+++ b/trunk/drivers/net/wireless/b43legacy/rfkill.c
@@ -34,6 +34,13 @@ bool b43legacy_is_hw_radio_enabled(struct b43legacy_wldev *dev)
 		      & B43legacy_MMIO_RADIO_HWENABLED_HI_MASK))
 			return 1;
 	} else {
+		/* To prevent CPU fault on PPC, do not read a register
+		 * unless the interface is started; however, on resume
+		 * for hibernation, this routine is entered early. When
+		 * that happens, unconditionally return TRUE.
+		 */
+		if (b43legacy_status(dev) < B43legacy_STAT_STARTED)
+			return 1;
 		if (b43legacy_read16(dev, B43legacy_MMIO_RADIO_HWENABLED_LO)
 		    & B43legacy_MMIO_RADIO_HWENABLED_LO_MASK)
 			return 1;