Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...

[deliverable/linux.git] / drivers / net / wireless / b43 / phy_a.c

diff --git a/drivers/net/wireless/b43/phy_a.c b/drivers/net/wireless/b43/phy_a.c
index c836c077d51df3f61aa2438a8e8a14066f7c3c94..816e028a2620c9b43d06f8b615e11a7c518ddb8a 100644 (file)
--- a/drivers/net/wireless/b43/phy_a.c
+++ b/drivers/net/wireless/b43/phy_a.c
@@ -480,11 +480,11 @@ static bool b43_aphy_op_supports_hwpctl(struct b43_wldev *dev)
 }
 
 static void b43_aphy_op_software_rfkill(struct b43_wldev *dev,
-                                       enum rfkill_state state)
+                                       bool blocked)
 {
        struct b43_phy *phy = &dev->phy;
 
-       if (state == RFKILL_STATE_UNBLOCKED) {
+       if (!blocked) {
                if (phy->radio_on)
                        return;
                b43_radio_write16(dev, 0x0004, 0x00C0);