From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9560A2ED151; Tue, 17 Jun 2025 15:48:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750175306; cv=none; b=UaKysHNTcGB30tyMY6udetQ7Q6z1Hz5mMGTwrVR3NBU0hXWPoh9kV5D/cAFkmiIQbHindOx70QI8EGo+DXGJ+tAGm13sTmGl2vF0+Wu9kr9HbJC/PbV39uVcpgIeQQ8gDH54SrmuZuN6f8P60YSuBUQqzq5H9+tF1BiDB9wlu5A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750175306; c=relaxed/simple; bh=zsc9A6V3efyKnZJ1j8RxW5RyX1bOAN8FDYG0JzmuPhQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u2eo1CySI3zwvU0PjBqV9gGP3qQ2m+d0EhTSck/T2FL6WlIdtrjxZD4F5A2Cg3WM0wKRTdpNdwvZPD/HSNO0kXQtI6WXB+JB6VAWBYUzeBS/XUjl+hT3t6ZwWvWcT7kg8TrCJOx6r9tQKHJk4gdYLOMHXlSOS94DSU8f5AEeKSM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ZVLbd2pl; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ZVLbd2pl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EDA45C4CEE3; Tue, 17 Jun 2025 15:48:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750175306; bh=zsc9A6V3efyKnZJ1j8RxW5RyX1bOAN8FDYG0JzmuPhQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZVLbd2pl4uMNjuhFF9uGNoH9kch/RW4ezADUM8epi6tQW4+iigKPq7aXTjcT082D8 4JlmCWhq91f8SAZ65fOqW2ZkuZgP9WXoVOI3wzxJWGLyfDKkT/U3Wtn8ilySUurejx 0SsfFfhlOTrnaBwIpxug6Nb9z7xqplgAn25hhjr8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zijun Hu , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 6.15 072/780] PM: wakeup: Delete space in the end of string shown by pm_show_wakelocks() Date: Tue, 17 Jun 2025 17:16:20 +0200 Message-ID: <20250617152454.447639279@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250617152451.485330293@linuxfoundation.org> References: <20250617152451.485330293@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zijun Hu [ Upstream commit f0050a3e214aa941b78ad4caf122a735a24d81a6 ] pm_show_wakelocks() is called to generate a string when showing attributes /sys/power/wake_(lock|unlock), but the string ends with an unwanted space that was added back by mistake by commit c9d967b2ce40 ("PM: wakeup: simplify the output logic of pm_show_wakelocks()"). Remove the unwanted space. Fixes: c9d967b2ce40 ("PM: wakeup: simplify the output logic of pm_show_wakelocks()") Signed-off-by: Zijun Hu Link: https://patch.msgid.link/20250505-fix_power-v1-1-0f7f2c2f338c@quicinc.com [ rjw: Changelog edits ] Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- kernel/power/wakelock.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kernel/power/wakelock.c b/kernel/power/wakelock.c index 52571dcad768b..4e941999a53ba 100644 --- a/kernel/power/wakelock.c +++ b/kernel/power/wakelock.c @@ -49,6 +49,9 @@ ssize_t pm_show_wakelocks(char *buf, bool show_active) len += sysfs_emit_at(buf, len, "%s ", wl->name); } + if (len > 0) + --len; + len += sysfs_emit_at(buf, len, "\n"); mutex_unlock(&wakelocks_lock); -- 2.39.5