From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1576794-1517682476-2-7486144172959029386 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES enda, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517682476; b=PTO5LGEbnxMXwGMLNa2s1hfhN9gM8o85XqtWb1fyc914p73 Ysxm9EmjSzEd+FWT4zr+PfzsdjGE6TkfMHNKcqo7SB43wTxo6DqXjwgfy2Z01Vzn P6IqRgmiylhM0EtDP+lUuCDRiqxrmYf91KztARKdbqYl5e8mx7EUg6SszfjNoSwy jbGKDsTwVTkJ7tP9JrdserdxWVPoj9mf5jPCCRdl3z+yFw5bf2xSKJ3YwYkb0TKi 1CuVHvBMsex1uA6ebtrx+1sk7A5m6xp7BZUUk0k2rP/1pOHCBMkEpAokIOzpg3Jx L3HlnXQPOeKp9EepRUOBFjixVV/1JzIo0IEK8QA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517682476; bh=aRJ0GN 4x/BA1ynWL5khAptllu+al7SYKaPl/083f/98=; b=t2+R1p0UOvjrZLXygAPEv7 4vaurJ5/iTM11uBe3JonOrT+CzsjxAWBWF1lhpLslZLMpCPTRQ4jfvQleuuJ5ak6 Lxwjy28q5AWYc54nIaCKXUpnWmmxTYNA8Wt7bKKB2+b7TqGQnDS5Da8CdigY1Q3r y2VNOBud9T72WhifnfcXRH6WJnFupSVxEgdAaRJHY+xwNP9wB6GJby2wA+Xz1vAc lP+resqCTVdgJJATsaG5VtntVf31cOlrCm8SF8BDPNGhdvaRY905HpogSLVfPa7A GNj1xMjEaPi6hjsUYfsbWSYqfwGngIFtrnW0Evl6aec/tPY3sZzQYq3i+p4k0+Cg == ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=kT7RWVXd x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=kT7RWVXd x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753474AbeBCS1w (ORCPT ); Sat, 3 Feb 2018 13:27:52 -0500 Received: from mail-co1nam03on0108.outbound.protection.outlook.com ([104.47.40.108]:59967 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753260AbeBCSGA (ORCPT ); Sat, 3 Feb 2018 13:06:00 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Matthieu CASTET , "linux-leds@vger.kernel.org" , Jacek Anaszewski , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 15/32] led: core: Fix brightness setting when setting delay_off=0 Thread-Topic: [PATCH AUTOSEL for 4.4 15/32] led: core: Fix brightness setting when setting delay_off=0 Thread-Index: AQHTnRlxbSRzHlCO4E2V4gfBdG/tcw== Date: Sat, 3 Feb 2018 18:04:32 +0000 Message-ID: <20180203180413.7438-15-alexander.levin@microsoft.com> References: <20180203180413.7438-1-alexander.levin@microsoft.com> In-Reply-To: <20180203180413.7438-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BL0PR2101MB1009;7:b6wketuTnSix07CCSk/uGCpcxo0RGrOk8g/Ag1+EbFjv52Yd3jxtaLm2/asFVZcl98F5rp400ONxaDdMHsPN2Xd0rTNdLbEAx1JK3yqBDmf6NxZkxG/Mw4o7mQVHFiZcxpdiYGHuwvXCxE4r4c64DylO/d3cCOiR9NIW6U+LePj3hyOH31Vktz4uwFD0i+AZRr7JU1ZmovhNcuK5L3kj2fs39tg2HS+1OeT9mMikv0DH6DFIbZnMjgeS43iYagLC x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 0d0a1492-f590-48b3-35ca-08d56b30bb5c x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:BL0PR2101MB1009; x-ms-traffictypediagnostic: BL0PR2101MB1009: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(9452136761055)(85827821059158); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(5005006)(8121501046)(10201501046)(3231101)(2400082)(944501161)(93006095)(93001095)(3002001)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123562045)(20161123564045)(6072148)(201708071742011);SRVR:BL0PR2101MB1009;BCL:0;PCL:0;RULEID:;SRVR:BL0PR2101MB1009; x-forefront-prvs: 05724A8921 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(39380400002)(366004)(39860400002)(346002)(396003)(376002)(189003)(199004)(6346003)(39060400002)(1076002)(26005)(107886003)(186003)(25786009)(6116002)(3846002)(3660700001)(105586002)(2501003)(10290500003)(99286004)(2906002)(3280700002)(5250100002)(4326008)(66066001)(36756003)(81166006)(81156014)(97736004)(8676002)(8936002)(54906003)(110136005)(72206003)(6666003)(86612001)(22452003)(53936002)(478600001)(59450400001)(68736007)(5660300001)(76176011)(6486002)(316002)(6506007)(102836004)(6436002)(2900100001)(14454004)(305945005)(575784001)(106356001)(10090500001)(86362001)(6512007)(2950100002)(7736002)(22906009)(21314002)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:BL0PR2101MB1009;H:BL0PR2101MB1027.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: 5dEV3+/oiWXpVll0NslEzJWPwJMZx3D0lrL/XRHgS6bcdkMuF1dRwXKE60bOYC4JeFuRkjUH6vy/V7NTuCTzgQ== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0d0a1492-f590-48b3-35ca-08d56b30bb5c X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Feb 2018 18:04:32.1902 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR2101MB1009 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Matthieu CASTET [ Upstream commit 2b83ff96f51d0b039c4561b9f95c824d7bddb85c ] With the current code, the following sequence won't work : echo timer > trigger echo 0 > delay_off * at this point we call ** led_delay_off_store ** led_blink_set *** stop timer ** led_blink_setup ** led_set_software_blink *** if !delay_on, led off *** if !delay_off, set led_set_brightness_nosleep <--- LED_BLINK_SW is set = but timer is stop *** otherwise start timer/set LED_BLINK_SW flag echo xxx > brightness * led_set_brightness ** if LED_BLINK_SW *** if brightness=3D0, led off *** else apply brightness if next timer <--- timer is stop, and will never = apply new setting ** otherwise set led_set_brightness_nosleep To fix that, when we delete the timer, we should clear LED_BLINK_SW. Cc: linux-leds@vger.kernel.org Signed-off-by: Matthieu CASTET Signed-off-by: Jacek Anaszewski Signed-off-by: Sasha Levin --- drivers/leds/led-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c index c1c3af089634..92b6798ef5b3 100644 --- a/drivers/leds/led-core.c +++ b/drivers/leds/led-core.c @@ -149,7 +149,7 @@ void led_blink_set(struct led_classdev *led_cdev, unsigned long *delay_on, unsigned long *delay_off) { - del_timer_sync(&led_cdev->blink_timer); + led_stop_software_blink(led_cdev); =20 led_cdev->flags &=3D ~LED_BLINK_ONESHOT; led_cdev->flags &=3D ~LED_BLINK_ONESHOT_STOP; --=20 2.11.0