Skip to content

Commit 6101973

Browse files
committed
undo bluetooth revert
1 parent 0fab31f commit 6101973

File tree

2 files changed

+1
-34
lines changed

2 files changed

+1
-34
lines changed

handheld.patch

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -68500,36 +68500,3 @@ index 9d6139a24982..9d886bded108 100644
6850068500
--
6850168501
2.47.0
6850268502

68503-
68504-
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
68505-
From: Antheas Kapenekakis <[email protected]>
68506-
Date: Tue, 19 Nov 2024 21:27:17 +0100
68507-
Subject: Revert "Bluetooth: btusb: Don't fail external suspend requests"
68508-
68509-
This reverts commit e63125eec47dcc169cf62a2a56448bec92a0a271.
68510-
68511-
Might be causing issues with hibernation on the Ally.
68512-
---
68513-
drivers/bluetooth/btusb.c | 6 ++----
68514-
1 file changed, 2 insertions(+), 4 deletions(-)
68515-
68516-
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
68517-
index 9d886bded108..e6f23692c9d6 100644
68518-
--- a/drivers/bluetooth/btusb.c
68519-
+++ b/drivers/bluetooth/btusb.c
68520-
@@ -4127,10 +4127,8 @@ static int btusb_suspend(struct usb_interface *intf, pm_message_t message)
68521-
68522-
BT_DBG("intf %p", intf);
68523-
68524-
- /* Don't auto-suspend if there are connections; external suspend calls
68525-
- * shall never fail.
68526-
- */
68527-
- if (PMSG_IS_AUTO(message) && hci_conn_count(data->hdev))
68528-
+ /* Don't suspend if there are connections */
68529-
+ if (hci_conn_count(data->hdev))
68530-
return -EBUSY;
68531-
68532-
if (data->suspend_count++)
68533-
--
68534-
2.47.0
68535-

kernel.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ Summary: The Linux kernel
170170
# This is needed to do merge window version magic
171171
%define patchlevel 11
172172
# This allows pkg_release to have configurable %%{?dist} tag
173-
%define specrelease 301%{?buildid}%{?dist}
173+
%define specrelease 302%{?buildid}%{?dist}
174174
# This defines the kabi tarball version
175175
%define kabiversion 6.11.9
176176

0 commit comments

Comments
 (0)