From 6101973666eb7ba75ac95f9e079b883a06f15ef7 Mon Sep 17 00:00:00 2001 From: Antheas Kapenekakis Date: Thu, 21 Nov 2024 20:39:55 +0100 Subject: [PATCH] undo bluetooth revert --- handheld.patch | 33 --------------------------------- kernel.spec | 2 +- 2 files changed, 1 insertion(+), 34 deletions(-) diff --git a/handheld.patch b/handheld.patch index 316035cfa..35fb6026d 100644 --- a/handheld.patch +++ b/handheld.patch @@ -68500,36 +68500,3 @@ index 9d6139a24982..9d886bded108 100644 -- 2.47.0 - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Antheas Kapenekakis -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 - diff --git a/kernel.spec b/kernel.spec index b719f158b..6905164c5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -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