From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: torvalds@linux-foundation.org, akpm@linux-foundation.org,
alan@lxorguk.ukuu.org.uk, Johan Hovold <jhovold@gmail.com>,
Antonio Ospite <ospite@studenti.unina.it>,
Johannes Berg <johannes@sipsolutions.net>,
Richard Purdie <rpurdie@rpsys.net>
Subject: [14/26] Revert "leds: save the delay values after a successful call to blink_set()"
Date: Fri, 18 Nov 2011 16:02:50 -0800 [thread overview]
Message-ID: <20111119000329.142583163@clark.kroah.org> (raw)
In-Reply-To: <20111119000336.GA8452@kroah.com>
3.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <jhovold@gmail.com>
commit cb871513f656bdfc48b185b55f37857b5c750c40 upstream.
Revert commit 6123b0e274503a0d3588e84fbe07c9aa01bfaf5d.
The problem this patch intends to solve has alreadqy been fixed by
commit 7a5caabd090b ("drivers/leds/ledtrig-timer.c: fix broken sysfs
delay handling").
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Cc: Antonio Ospite <ospite@studenti.unina.it>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/leds/led-class.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -270,11 +270,8 @@ void led_blink_set(struct led_classdev *
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)
next prev parent reply other threads:[~2011-11-19 0:09 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-19 0:03 [00/26] 3.1.2-stable review Greg KH
2011-11-19 0:02 ` [01/26] ALSA: hda - fix internal mic on Dell Vostro 3500 laptop Greg KH
2011-11-19 0:02 ` [02/26] ALSA: hda - Dont add elements of other codecs to vmaster slave Greg KH
2011-11-19 0:02 ` [03/26] virtio-pci: fix use after free Greg KH
2011-11-19 0:02 ` [04/26] ARM: at91: Fix USBA gadget registration Greg KH
2011-11-19 0:02 ` [05/26] ASoC: Dont use wm8994->control_data in wm8994_readable_register() Greg KH
2011-11-19 0:02 ` [06/26] sh: Fix cached/uncaced address calculation in 29bit mode Greg KH
2011-11-19 0:02 ` [07/26] drm/i915: Fix object refcount leak on mmappable size limit error path Greg KH
2011-11-19 0:02 ` [08/26] drm/nouveau: initialize chan->fence.lock before use Greg KH
2011-11-19 0:02 ` [09/26] drm/radeon/kms: make an aux failure debug only Greg KH
2011-11-19 0:02 ` [10/26] ALSA: usb-audio - Check the dB-range validity in the later read, too Greg KH
2011-11-19 0:02 ` [11/26] ALSA: usb-audio - Fix the missing volume quirks at delayed init Greg KH
2011-11-19 0:02 ` [12/26] KEYS: Fix a NULL pointer deref in the user-defined key type Greg KH
2011-11-19 0:02 ` [13/26] hfs: add sanity check for file name length Greg KH
2011-11-19 0:02 ` Greg KH [this message]
2011-11-19 0:02 ` [15/26] drm/radeon: add some missing FireMV pci ids Greg KH
2011-11-19 0:02 ` [16/26] staging: brcm80211: fill in proper rx rate in mac80211 rx status Greg KH
2011-11-19 0:02 ` [17/26] b43: refuse to load unsupported firmware Greg KH
2011-11-19 17:22 ` Ben Hutchings
2011-11-19 19:05 ` Greg KH
2011-11-19 19:49 ` Ben Hutchings
2011-11-19 0:02 ` [18/26] mfd: Fix twl4030 dependencies for audio codec Greg KH
2011-11-19 0:02 ` [19/26] xen:pvhvm: enable PVHVM VCPU placement when using more than 32 CPUs Greg KH
2011-11-19 0:02 ` [20/26] xen-gntalloc: integer overflow in gntalloc_ioctl_alloc() Greg KH
2011-11-19 0:02 ` [21/26] xen-gntalloc: signedness bug in add_grefs() Greg KH
2011-11-19 0:02 ` [22/26] powerpc/ps3: Fix lost SMP IPIs Greg KH
2011-11-19 0:02 ` [23/26] powerpc: Add hvcall.h include to book3s_hv.c Greg KH
2011-11-19 0:03 ` [24/26] powerpc: Copy down exception vectors after feature fixups Greg KH
2011-11-19 0:03 ` [25/26] backing-dev: ensure wakeup_timer is deleted Greg KH
2011-11-19 0:03 ` [26/26] block: Always check length of all iov entries in blk_rq_map_user_iov() Greg KH
2011-11-19 19:57 ` [00/26] 3.1.2-stable review Woody Suwalski
2011-11-20 0:43 ` Greg KH
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=20111119000329.142583163@clark.kroah.org \
--to=gregkh@suse.de \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=jhovold@gmail.com \
--cc=johannes@sipsolutions.net \
--cc=linux-kernel@vger.kernel.org \
--cc=ospite@studenti.unina.it \
--cc=rpurdie@rpsys.net \
--cc=stable@vger.kernel.org \
--cc=torvalds@linux-foundation.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
all inboxes | Powered by JetHome®