From: Johan Hovold <jhovold@gmail.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Antonio Ospite <ospite@studenti.unina.it>,
Johannes Berg <johannes@sipsolutions.net>,
Richard Purdie <rpurdie@rpsys.net>,
stable@kernel.org, linux-kernel@vger.kernel.org,
Johan Hovold <jhovold@gmail.com>
Subject: [PATCH] Revert "leds: save the delay values after a successful call to blink_set()"
Date: Mon, 7 Nov 2011 11:36:37 +0100 [thread overview]
Message-ID: <1320662197-21471-1-git-send-email-jhovold@gmail.com> (raw)
In-Reply-To: <1317973118.3988.2.camel@jlt3.sipsolutions.net>
This reverts commit 6123b0e274503a0d3588e84fbe07c9aa01bfaf5d.
The problem this patch intends to solve has already been fixed by commit
7a5caabd090b8f7 (drivers/leds/ledtrig-timer.c: fix broken sysfs delay
handling).
Signed-off-by: Johan Hovold <jhovold@gmail.com>
---
Hi,
A fix for the problem with the delay parameters not being stored is already in
3.1 (and stable). Rather than storing both values at every call to
led_blink_set only the updated value is stored in led_delay_{on,off}_store in
ledtrig-timer.c.
Thanks,
Johan
drivers/leds/led-class.c | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index 661b692..6d5628b 100644
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -270,11 +270,8 @@ void led_blink_set(struct led_classdev *led_cdev,
del_timer_sync(&led_cdev->blink_timer);
if (led_cdev->blink_set &&
- !led_cdev->blink_set(led_cdev, delay_on, delay_off)) {
- led_cdev->blink_delay_on = *delay_on;
- led_cdev->blink_delay_off = *delay_off;
+ !led_cdev->blink_set(led_cdev, delay_on, delay_off))
return;
- }
/* blink with 1 Hz as default if nothing specified */
if (!*delay_on && !*delay_off)
--
1.7.6
next prev parent reply other threads:[~2011-11-07 11:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-06 22:03 [PATCH 0/2] leds: some issues with hardware blinking Antonio Ospite
2011-10-06 22:03 ` [PATCH 1/2] leds: save the delay values after a successful call to blink_set() Antonio Ospite
2011-10-07 7:38 ` Johannes Berg
2011-11-07 10:36 ` Johan Hovold [this message]
2011-11-16 21:21 ` [PATCH] Revert "leds: save the delay values after a successful call to blink_set()" Antonio Ospite
2011-11-18 19:06 ` Johan Hovold
2011-10-06 22:03 ` [PATCH 2/2] leds: turn the blink_timer off before starting to blink Antonio Ospite
2011-10-07 7:39 ` Johannes Berg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1320662197-21471-1-git-send-email-jhovold@gmail.com \
--to=jhovold@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=johannes@sipsolutions.net \
--cc=linux-kernel@vger.kernel.org \
--cc=ospite@studenti.unina.it \
--cc=rpurdie@rpsys.net \
--cc=stable@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox