Skip to content

Commit

Permalink
undo bluetooth revert
Browse files Browse the repository at this point in the history
  • Loading branch information
antheas committed Nov 21, 2024
1 parent 0fab31f commit 6101973
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 34 deletions.
33 changes: 0 additions & 33 deletions handheld.patch
Original file line number Diff line number Diff line change
Expand Up @@ -68500,36 +68500,3 @@ index 9d6139a24982..9d886bded108 100644
--
2.47.0


From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Antheas Kapenekakis <[email protected]>
Date: Tue, 19 Nov 2024 21:27:17 +0100
Subject: Revert "Bluetooth: btusb: Don't fail external suspend requests"

This reverts commit e63125eec47dcc169cf62a2a56448bec92a0a271.

Might be causing issues with hibernation on the Ally.
---
drivers/bluetooth/btusb.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 9d886bded108..e6f23692c9d6 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -4127,10 +4127,8 @@ static int btusb_suspend(struct usb_interface *intf, pm_message_t message)

BT_DBG("intf %p", intf);

- /* Don't auto-suspend if there are connections; external suspend calls
- * shall never fail.
- */
- if (PMSG_IS_AUTO(message) && hci_conn_count(data->hdev))
+ /* Don't suspend if there are connections */
+ if (hci_conn_count(data->hdev))
return -EBUSY;

if (data->suspend_count++)
--
2.47.0

2 changes: 1 addition & 1 deletion kernel.spec
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ Summary: The Linux kernel
# This is needed to do merge window version magic
%define patchlevel 11
# This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 301%{?buildid}%{?dist}
%define specrelease 302%{?buildid}%{?dist}
# This defines the kabi tarball version
%define kabiversion 6.11.9

Expand Down

0 comments on commit 6101973

Please sign in to comment.