Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S934520AbbEOINP (ORCPT <rfc822;w@1wt.eu>);
	Fri, 15 May 2015 04:13:15 -0400
Received: from mailout4.w1.samsung.com ([210.118.77.14]:20290 "EHLO
	mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S934258AbbEOIMw (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 15 May 2015 04:12:52 -0400
X-AuditID: cbfec7f4-f79c56d0000012ee-12-5555aa8110b7
Message-id: <5555AA7F.1000001@samsung.com>
Date: Fri, 15 May 2015 10:12:47 +0200
From: Jacek Anaszewski <j.anaszewski@samsung.com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130804
 Thunderbird/17.0.8
MIME-version: 1.0
To: Stas Sergeev <stsp@list.ru>
Cc: linux-leds@vger.kernel.org, Linux kernel <linux-kernel@vger.kernel.org>,
        Bryan Wu <cooloney@gmail.com>, Richard Purdie <rpurdie@rpsys.net>,
        Kyungmin Park <kyungmin.park@samsung.com>,
        Stas Sergeev <stsp@users.sourceforge.net>
Subject: Re: [PATCH v2] leds: fix brightness changing when software blinking is
 active
References: <5554BE12.7050209@list.ru>
In-reply-to: <5554BE12.7050209@list.ru>
Content-type: text/plain; charset=UTF-8; format=flowed
Content-transfer-encoding: 7bit
X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrALMWRmVeSWpSXmKPExsVy+t/xK7qNq0JDDSadY7E4unMik8XZpjfs
	Fpd3zWGz2PpmHaPF7l1PWS1aNzUwW3T2TWNxYPfYOesuu8e9LZeZPfbM/8Hq0bdlFaNH06l2
	Vo/Pm+QC2KK4bFJSczLLUov07RK4Mh5M7WMruCtUMfvZY7YGxpX8XYycHBICJhJr28+zQNhi
	EhfurWfrYuTiEBJYyihx7tZOFgjnGaPEmn2HmEGqeAW0JJ6d38PaxcjBwSKgKnFzchRImE3A
	UOLni9dMILaoQITEn9P7WCHKBSV+TL7HAlIuIiAvsaGxDGQks8ArRomXrx4ygtQIA9W3TzsM
	doSQgJrE1im7wGxOAXWJ2zN2gdUwC5hJPGpZxwxhy0tsXvOWeQKjwCwkK2YhKZuFpGwBI/Mq
	RtHU0uSC4qT0XEO94sTc4tK8dL3k/NxNjJBw/7KDcfExq0OMAhyMSjy8GvyhoUKsiWXFlbmH
	GCU4mJVEeIuCgEK8KYmVValF+fFFpTmpxYcYpTlYlMR55+56HyIkkJ5YkpqdmlqQWgSTZeLg
	lGpgnGuQtqDcVHaOxKXrxqy/yllUjstNb7CcXcjZ+k+9WVSwRYr58iwxhyuCRZ+Nyu2V8oPE
	K47fl1Zd+6TseMhUKcsnmZLbTO9+nfGSOdUlx4hrX9mNVQ8Pqamvneze6eGua5TY8vvPttYp
	V18fcjXKikzIOcX8+3LOm5j1oc9mPOEw+122dsEGJZbijERDLeai4kQAA2gmQ3MCAAA=
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 2574
Lines: 73

Hi Stas,

On 05/14/2015 05:24 PM, Stas Sergeev wrote:
>
> The following sequence:
> echo timer >/sys/class/leds/<name>/trigger
> echo 1 >/sys/class/leds/<name>/brightness
> should change the ON brightness for blinking.
> The function led_set_brightness() was mistakenly initiating the
> delayed blink stop procedure, which resulted in no blinking with
> the timer trigger still active.
>
> This patch fixes the problem by changing led_set_brightness()
> to not initiate the delayed blink stop when brightness is not 0.
>
> CC: Bryan Wu <cooloney@gmail.com>
> CC: Richard Purdie <rpurdie@rpsys.net>
> CC: Jacek Anaszewski <j.anaszewski@samsung.com>
> CC: Kyungmin Park <kyungmin.park@samsung.com>
> CC: linux-leds@vger.kernel.org
> CC: linux-kernel@vger.kernel.org
>
> Signed-off-by: Stas Sergeev <stsp@users.sourceforge.net>
> ---
>   drivers/leds/led-class.c |    5 +++++
>   drivers/leds/led-core.c  |    5 +++--
>   2 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
> index 795ec99..65c2c80 100644
> --- a/drivers/leds/led-class.c
> +++ b/drivers/leds/led-class.c
> @@ -121,6 +121,11 @@ static void led_timer_function(unsigned long data)
>   	brightness = led_get_brightness(led_cdev);
>   	if (!brightness) {
>   		/* Time to switch the LED on. */
> +		if (led_cdev->delayed_set_value) {
> +			led_cdev->blink_brightness =
> +					led_cdev->delayed_set_value;
> +			led_cdev->delayed_set_value = 0;
> +		}
>   		brightness = led_cdev->blink_brightness;
>   		delay = led_cdev->blink_delay_on;
>   	} else {
> diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
> index 356e851..a90dd26 100644
> --- a/drivers/leds/led-core.c
> +++ b/drivers/leds/led-core.c
> @@ -119,10 +119,11 @@ void led_set_brightness(struct led_classdev *led_cdev,
>   {
>   	int ret = 0;
>
> -	/* delay brightness setting if need to stop soft-blink timer */
> +	/* delay brightness if soft-blink is active */
>   	if (led_cdev->blink_delay_on || led_cdev->blink_delay_off) {
>   		led_cdev->delayed_set_value = brightness;
> -		schedule_work(&led_cdev->set_brightness_work);
> +		if (brightness == LED_OFF)
> +			schedule_work(&led_cdev->set_brightness_work);
>   		return;
>   	}
>

Acked-by: Jacek Anaszewski <j.anaszewski@samsung.com>

-- 
Best Regards,
Jacek Anaszewski
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/