Skip to content

Commit

Permalink
b43: fix build error if !CONFIG_B43_LEDS
Browse files Browse the repository at this point in the history
Fix the following build error when CONFIG_B43_LEDS is not selected:

drivers/net/wireless/b43/main.c: In function 'b43_remove':
drivers/net/wireless/b43/main.c:4990: error: 'struct b43_leds' has no member named 'stop'
drivers/net/wireless/b43/main.c:4991: error: 'struct b43_leds' has no member named 'work'
make[4]: *** [drivers/net/wireless/b43/main.o] Error 1

Signed-off-by: Albert Herranz <albert_herranz@yahoo.es>
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Albert Herranz authored and John W. Linville committed Sep 23, 2009
1 parent e899a3f commit 82905ac
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
8 changes: 8 additions & 0 deletions drivers/net/wireless/b43/leds.c
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,14 @@ void b43_leds_exit(struct b43_wldev *dev)
b43_led_turn_off(dev, leds->led_radio.index, leds->led_radio.activelow);
}

void b43_leds_stop(struct b43_wldev *dev)
{
struct b43_leds *leds = &dev->wl->leds;

leds->stop = 1;
cancel_work_sync(&leds->work);
}

void b43_leds_register(struct b43_wldev *dev)
{
unsigned int i;
Expand Down
4 changes: 4 additions & 0 deletions drivers/net/wireless/b43/leds.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ void b43_leds_register(struct b43_wldev *dev);
void b43_leds_unregister(struct b43_wldev *dev);
void b43_leds_init(struct b43_wldev *dev);
void b43_leds_exit(struct b43_wldev *dev);
void b43_leds_stop(struct b43_wldev *dev);


#else /* CONFIG_B43_LEDS */
Expand All @@ -84,6 +85,9 @@ static inline void b43_leds_init(struct b43_wldev *dev)
static inline void b43_leds_exit(struct b43_wldev *dev)
{
}
static inline void b43_leds_stop(struct b43_wldev *dev)
{
}
#endif /* CONFIG_B43_LEDS */

#endif /* B43_LEDS_H_ */
3 changes: 1 addition & 2 deletions drivers/net/wireless/b43/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -4987,8 +4987,7 @@ static void b43_remove(struct ssb_device *dev)
* might have modified it. Restoring is important, so the networking
* stack can properly free resources. */
wl->hw->queues = wl->mac80211_initially_registered_queues;
wl->leds.stop = 1;
cancel_work_sync(&wl->leds.work);
b43_leds_stop(wldev);
ieee80211_unregister_hw(wl->hw);
}

Expand Down

0 comments on commit 82905ac

Please sign in to comment.