diff options
author | Albert Herranz <albert_herranz@yahoo.es> | 2009-09-15 18:26:19 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-09-23 11:35:45 -0400 |
commit | 82905ace22614fe220875fc5748b1afbac868a76 (patch) | |
tree | c6b896a3c1a1fa917279750604a0421086545827 /drivers | |
parent | e899a3f232125c393cdf7f7bf6533501ef8808fb (diff) |
b43: fix build error if !CONFIG_B43_LEDS
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/b43/leds.c | 8 | ||||
-rw-r--r-- | drivers/net/wireless/b43/leds.h | 4 | ||||
-rw-r--r-- | drivers/net/wireless/b43/main.c | 3 |
3 files changed, 13 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/leds.c b/drivers/net/wireless/b43/leds.c index fbe31e02688b..fbe3d4f62ce2 100644 --- a/drivers/net/wireless/b43/leds.c +++ b/drivers/net/wireless/b43/leds.c | |||
@@ -325,6 +325,14 @@ void b43_leds_exit(struct b43_wldev *dev) | |||
325 | b43_led_turn_off(dev, leds->led_radio.index, leds->led_radio.activelow); | 325 | b43_led_turn_off(dev, leds->led_radio.index, leds->led_radio.activelow); |
326 | } | 326 | } |
327 | 327 | ||
328 | void b43_leds_stop(struct b43_wldev *dev) | ||
329 | { | ||
330 | struct b43_leds *leds = &dev->wl->leds; | ||
331 | |||
332 | leds->stop = 1; | ||
333 | cancel_work_sync(&leds->work); | ||
334 | } | ||
335 | |||
328 | void b43_leds_register(struct b43_wldev *dev) | 336 | void b43_leds_register(struct b43_wldev *dev) |
329 | { | 337 | { |
330 | unsigned int i; | 338 | unsigned int i; |
diff --git a/drivers/net/wireless/b43/leds.h b/drivers/net/wireless/b43/leds.h index 49d3da540c28..9592e4c5a5f5 100644 --- a/drivers/net/wireless/b43/leds.h +++ b/drivers/net/wireless/b43/leds.h | |||
@@ -63,6 +63,7 @@ void b43_leds_register(struct b43_wldev *dev); | |||
63 | void b43_leds_unregister(struct b43_wldev *dev); | 63 | void b43_leds_unregister(struct b43_wldev *dev); |
64 | void b43_leds_init(struct b43_wldev *dev); | 64 | void b43_leds_init(struct b43_wldev *dev); |
65 | void b43_leds_exit(struct b43_wldev *dev); | 65 | void b43_leds_exit(struct b43_wldev *dev); |
66 | void b43_leds_stop(struct b43_wldev *dev); | ||
66 | 67 | ||
67 | 68 | ||
68 | #else /* CONFIG_B43_LEDS */ | 69 | #else /* CONFIG_B43_LEDS */ |
@@ -84,6 +85,9 @@ static inline void b43_leds_init(struct b43_wldev *dev) | |||
84 | static inline void b43_leds_exit(struct b43_wldev *dev) | 85 | static inline void b43_leds_exit(struct b43_wldev *dev) |
85 | { | 86 | { |
86 | } | 87 | } |
88 | static inline void b43_leds_stop(struct b43_wldev *dev) | ||
89 | { | ||
90 | } | ||
87 | #endif /* CONFIG_B43_LEDS */ | 91 | #endif /* CONFIG_B43_LEDS */ |
88 | 92 | ||
89 | #endif /* B43_LEDS_H_ */ | 93 | #endif /* B43_LEDS_H_ */ |
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index a8840ef63770..6c0ea214a82e 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
@@ -4987,8 +4987,7 @@ static void b43_remove(struct ssb_device *dev) | |||
4987 | * might have modified it. Restoring is important, so the networking | 4987 | * might have modified it. Restoring is important, so the networking |
4988 | * stack can properly free resources. */ | 4988 | * stack can properly free resources. */ |
4989 | wl->hw->queues = wl->mac80211_initially_registered_queues; | 4989 | wl->hw->queues = wl->mac80211_initially_registered_queues; |
4990 | wl->leds.stop = 1; | 4990 | b43_leds_stop(wldev); |
4991 | cancel_work_sync(&wl->leds.work); | ||
4992 | ieee80211_unregister_hw(wl->hw); | 4991 | ieee80211_unregister_hw(wl->hw); |
4993 | } | 4992 | } |
4994 | 4993 | ||