diff options
Diffstat (limited to 'drivers/net/wireless/b43/debugfs.c')
-rw-r--r-- | drivers/net/wireless/b43/debugfs.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/b43/debugfs.c b/drivers/net/wireless/b43/debugfs.c index 93e5030aa6c3..e38ed0fe72e9 100644 --- a/drivers/net/wireless/b43/debugfs.c +++ b/drivers/net/wireless/b43/debugfs.c | |||
@@ -222,8 +222,6 @@ out: | |||
222 | static int txpower_g_write_file(struct b43_wldev *dev, | 222 | static int txpower_g_write_file(struct b43_wldev *dev, |
223 | const char *buf, size_t count) | 223 | const char *buf, size_t count) |
224 | { | 224 | { |
225 | unsigned long phy_flags; | ||
226 | |||
227 | if (dev->phy.type != B43_PHYTYPE_G) | 225 | if (dev->phy.type != B43_PHYTYPE_G) |
228 | return -ENODEV; | 226 | return -ENODEV; |
229 | if ((count >= 4) && (memcmp(buf, "auto", 4) == 0)) { | 227 | if ((count >= 4) && (memcmp(buf, "auto", 4) == 0)) { |
@@ -247,12 +245,12 @@ static int txpower_g_write_file(struct b43_wldev *dev, | |||
247 | dev->phy.tx_control |= B43_TXCTL_PA2DB; | 245 | dev->phy.tx_control |= B43_TXCTL_PA2DB; |
248 | if (pa3db) | 246 | if (pa3db) |
249 | dev->phy.tx_control |= B43_TXCTL_PA3DB; | 247 | dev->phy.tx_control |= B43_TXCTL_PA3DB; |
250 | b43_phy_lock(dev, phy_flags); | 248 | b43_phy_lock(dev); |
251 | b43_radio_lock(dev); | 249 | b43_radio_lock(dev); |
252 | b43_set_txpower_g(dev, &dev->phy.bbatt, | 250 | b43_set_txpower_g(dev, &dev->phy.bbatt, |
253 | &dev->phy.rfatt, dev->phy.tx_control); | 251 | &dev->phy.rfatt, dev->phy.tx_control); |
254 | b43_radio_unlock(dev); | 252 | b43_radio_unlock(dev); |
255 | b43_phy_unlock(dev, phy_flags); | 253 | b43_phy_unlock(dev); |
256 | } | 254 | } |
257 | 255 | ||
258 | return 0; | 256 | return 0; |