Commit 82905ace authored by Albert Herranz's avatar Albert Herranz Committed by John W. Linville
Browse files

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: default avatarAlbert Herranz <albert_herranz@yahoo.es>
Signed-off-by: default avatarMichael Buesch <mb@bu3sch.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e899a3f2

drivers/net/wireless/b43/leds.c

+8 −0
Original line number Diff line number Diff line
@@ -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;

drivers/net/wireless/b43/leds.h

+4 −0
Original line number Diff line number Diff line
@@ -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 */
@@ -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_ */

drivers/net/wireless/b43/main.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE