Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 90170
b: refs/heads/master
c: 72fa559
h: refs/heads/master
v: v3
  • Loading branch information
Ivo van Doorn authored and John W. Linville committed Mar 13, 2008
1 parent de873eb commit 1cca0f7
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 728103794316f7ff8d98bc2ce044aff7a260ee21
refs/heads/master: 72fa559bf44aab30ac5fc8317472ef3441f4aa64
7 changes: 3 additions & 4 deletions trunk/drivers/net/wireless/rt2x00/rt2x00leds.c
Original file line number Diff line number Diff line change
Expand Up @@ -109,15 +109,15 @@ static int rt2x00leds_register_led(struct rt2x00_dev *rt2x00dev,
return 0;
}

int rt2x00leds_register(struct rt2x00_dev *rt2x00dev)
void rt2x00leds_register(struct rt2x00_dev *rt2x00dev)
{
char *trigger;
char dev_name[16];
char name[32];
int retval;

if (!rt2x00dev->ops->lib->led_brightness)
return 0;
return;

snprintf(dev_name, sizeof(dev_name), "%s-%s",
rt2x00dev->ops->name, wiphy_name(rt2x00dev->hw->wiphy));
Expand Down Expand Up @@ -161,11 +161,10 @@ int rt2x00leds_register(struct rt2x00_dev *rt2x00dev)
goto exit_fail;
}

return 0;
return;

exit_fail:
rt2x00leds_unregister(rt2x00dev);
return retval;
}

static void rt2x00leds_unregister_trigger(struct rt2x00_trigger *trigger)
Expand Down
5 changes: 2 additions & 3 deletions trunk/drivers/net/wireless/rt2x00/rt2x00lib.h
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ static inline void rt2x00rfkill_free(struct rt2x00_dev *rt2x00dev)
*/
#ifdef CONFIG_RT2X00_LIB_LEDS
void rt2x00leds_led_quality(struct rt2x00_dev *rt2x00dev, int rssi);
int rt2x00leds_register(struct rt2x00_dev *rt2x00dev);
void rt2x00leds_register(struct rt2x00_dev *rt2x00dev);
void rt2x00leds_unregister(struct rt2x00_dev *rt2x00dev);
void rt2x00leds_suspend(struct rt2x00_dev *rt2x00dev);
void rt2x00leds_resume(struct rt2x00_dev *rt2x00dev);
Expand All @@ -199,9 +199,8 @@ static inline void rt2x00leds_led_quality(struct rt2x00_dev *rt2x00dev,
{
}

static inline int rt2x00leds_register(struct rt2x00_dev *rt2x00dev)
static inline void rt2x00leds_register(struct rt2x00_dev *rt2x00dev)
{
return 0;
}

static inline void rt2x00leds_unregister(struct rt2x00_dev *rt2x00dev)
Expand Down

0 comments on commit 1cca0f7

Please sign in to comment.