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 F33AE3242D7; Sat, 30 May 2026 17:19:53 +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=1780161594; cv=none; b=gN5tEHosrNHbRf24WMSVIcXh0lIMAFegTGHmGCSvaknZdoAIjOEBhUWV0a5DMFodSkAE/529YuFfR8f/GlrnlsZ3pgoBZIa8eYeiwuqcjcYMLlEN0fPsbnYWo71HSP7TmQtLF95CllEx+ZnM8RwzCt85BIJRRZfwnIfheiWYebE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780161594; c=relaxed/simple; bh=8xcI0190sC4Soa4fxCphow7iKBGoyM5s+w4ZxYo7ilk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=iZKXwTSUczpnpYHu7bReOJJiNJvyvRP7LpF/ZaYSOj218UUjPTP6eCte7KX5Spxde3hvYUoWqXH2LBJuZZPYTsmV4ebKO2NT/Uezx7ekvvfGq4egNJw3ZssgqagGXXk5ftQ7fq/QsdQ0W00t2XA87tjIBVi4pbj/d/gwebiKOmw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=uKEmuzg9; 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="uKEmuzg9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 40B251F00893; Sat, 30 May 2026 17:19:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780161593; bh=hjwlGJPcAUHIbqyipI1DZuOwucxp+UVFvmKCF5cnBuA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=uKEmuzg9n6Ky7EQPRZQS2SBnlcRxYBFC20bfT+eGPMydJyVu9iBcFkxg8D+aobeC8 Ex73A0VB3fM6waR/Mgtx19pkgxCX42b6oVpQQanZ/6qlJBm2nQnGgiUJ+W8hQkG5Gr tRTR5LKLK4AaPGjuzEDvU/SjurbqmALg033Um9Ho= 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 6.1 639/969] platform/surface: surfacepro3_button: Drop wakeup source on remove Date: Sat, 30 May 2026 18:02:43 +0200 Message-ID: <20260530160318.095479856@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160300.485627683@linuxfoundation.org> References: <20260530160300.485627683@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 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Rafael J. Wysocki [ Upstream commit 1410a228ab2d36fe2b383415a632ae12048d4f3a ] The wakeup source added by device_init_wakeup() in surface_button_add() needs to be dropped during driver removal, so update the driver to do that. Fixes: 19351f340765 ("platform/x86: surfacepro3: Support for wakeup from suspend-to-idle") Signed-off-by: Rafael J. Wysocki Link: https://patch.msgid.link/4368848.1IzOArtZ34@rafael.j.wysocki Reviewed-by: Ilpo Järvinen Signed-off-by: Ilpo Järvinen Signed-off-by: Sasha Levin --- drivers/platform/surface/surfacepro3_button.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/platform/surface/surfacepro3_button.c b/drivers/platform/surface/surfacepro3_button.c index 242fb690dcaf7..892fb71d5916f 100644 --- a/drivers/platform/surface/surfacepro3_button.c +++ b/drivers/platform/surface/surfacepro3_button.c @@ -243,6 +243,7 @@ static int surface_button_remove(struct acpi_device *device) { struct surface_button *button = acpi_driver_data(device); + device_init_wakeup(&device->dev, false); input_unregister_device(button->input); kfree(button); return 0; -- 2.53.0