Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 117744
b: refs/heads/master
c: dd8e5a2
h: refs/heads/master
v: v3
  • Loading branch information
Sven Wegener authored and Richard Purdie committed Oct 20, 2008
1 parent b90ffaa commit 375f2f1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 11 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: 6af4f55c31764c2d97ddf59ae2149cd1769e2e25
refs/heads/master: dd8e5a2039607e0f79c33549726a2415d977c938
5 changes: 1 addition & 4 deletions trunk/drivers/leds/led-class.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,11 @@ static ssize_t led_brightness_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
struct led_classdev *led_cdev = dev_get_drvdata(dev);
ssize_t ret = 0;

/* no lock needed for this */
led_update_brightness(led_cdev);
sprintf(buf, "%u\n", led_cdev->brightness);
ret = strlen(buf) + 1;

return ret;
return sprintf(buf, "%u\n", led_cdev->brightness);
}

static ssize_t led_brightness_store(struct device *dev,
Expand Down
8 changes: 2 additions & 6 deletions trunk/drivers/leds/ledtrig-timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,7 @@ static ssize_t led_delay_on_show(struct device *dev,
struct led_classdev *led_cdev = dev_get_drvdata(dev);
struct timer_trig_data *timer_data = led_cdev->trigger_data;

sprintf(buf, "%lu\n", timer_data->delay_on);

return strlen(buf) + 1;
return sprintf(buf, "%lu\n", timer_data->delay_on);
}

static ssize_t led_delay_on_store(struct device *dev,
Expand Down Expand Up @@ -116,9 +114,7 @@ static ssize_t led_delay_off_show(struct device *dev,
struct led_classdev *led_cdev = dev_get_drvdata(dev);
struct timer_trig_data *timer_data = led_cdev->trigger_data;

sprintf(buf, "%lu\n", timer_data->delay_off);

return strlen(buf) + 1;
return sprintf(buf, "%lu\n", timer_data->delay_off);
}

static ssize_t led_delay_off_store(struct device *dev,
Expand Down

0 comments on commit 375f2f1

Please sign in to comment.