From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 9026A44AB7B; Tue, 21 Jul 2026 22:09:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784671781; cv=none; b=FYpyn4nNtRcocGNMOjJhbx6/xoYzX4QLKBLJq7IT+O6QRPXFANP0t7G69g67rMUZgQ2JdTWUbM2suf5K5nGyyhs2rgkeSNI40IJukjqHVpWIG0a7vx08FvjQ2uYVowiv3OJjxz+oTqNPeqaca6Caq04uzUqvvlLlfyEiicTSE5U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784671781; c=relaxed/simple; bh=X6f72MtyJCDXmlf21yrhhis/cOQyO002QMK4lE6QQ0g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Zy4PcK82tGMiVXQGHtp+UpH+zujhvaDT+LX7hYHVIlgDHOEaEMre+EparjuQZs1m/Qzh9NgplkEKR9VULpwPK5tVfMQ+sb8lLhM4VRR69aKywmLMcbXJO1v86LmYIKuxuxcKprPtuAQzcvGi6Gz1uDIEGUa3qyzoZQfLW00WrmQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=OBkTGM2R; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="OBkTGM2R" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0295A1F000E9; Tue, 21 Jul 2026 22:09:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784671780; bh=AkmBnGoEEGY9GNKdPj+uIHipvxQs1V0UO1azDWCkcDw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=OBkTGM2RwTceTQo461UHkrDtQgGdJECSHDeuO2ryYGZNAmJRl5vhaTVDbLWFm+gBz 0SEMreF5XCJ4bbMDwtq5jprP/0aTYNM6oJsKW7xWUORMpU8gaZxl1PUB/qA9qHR8vL vQ2A3KCF0mANLAKV3/n1jn1hyc60GVEgInyuBp18= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Rafael J. Wysocki" , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Sasha Levin Subject: [PATCH 5.15 376/843] x86/platform/olpc: xo15: Drop wakeup source on driver removal Date: Tue, 21 Jul 2026 17:20:11 +0200 Message-ID: <20260721152414.493880061@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152405.946368001@linuxfoundation.org> References: <20260721152405.946368001@linuxfoundation.org> User-Agent: quilt/0.69 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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Rafael J. Wysocki [ Upstream commit cc966553e6ff0849978b5754531b768b0ff54985 ] Prevent leaking a wakeup source object after removing the driver by adding appropriate cleanup code to its remove callback function. Fixes: a0f30f592d2d ("x86, olpc: Add XO-1.5 SCI driver") Signed-off-by: Rafael J. Wysocki Link: https://patch.msgid.link/2069931.usQuhbGJ8B@rafael.j.wysocki Reviewed-by: Ilpo Järvinen Signed-off-by: Ilpo Järvinen Signed-off-by: Sasha Levin --- arch/x86/platform/olpc/olpc-xo15-sci.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/platform/olpc/olpc-xo15-sci.c b/arch/x86/platform/olpc/olpc-xo15-sci.c index 994a229cb79fe1..76ba025a545c79 100644 --- a/arch/x86/platform/olpc/olpc-xo15-sci.c +++ b/arch/x86/platform/olpc/olpc-xo15-sci.c @@ -185,6 +185,7 @@ static int xo15_sci_add(struct acpi_device *device) static int xo15_sci_remove(struct acpi_device *device) { + device_init_wakeup(&device->dev, false); acpi_disable_gpe(NULL, xo15_sci_gpe); acpi_remove_gpe_handler(NULL, xo15_sci_gpe, xo15_sci_gpe_handler); cancel_work_sync(&sci_work); -- 2.53.0