pulseaudio: remove upstreamed patch

This patch was added in pulseaudio v15.99.1, poky currently provides v17.0

https://onedigi.atlassian.net/browse/DEL-9011

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
This commit is contained in:
Gabriel Valcazar 2024-05-14 18:06:58 +02:00
parent 253304ede7
commit cb3b03552c
2 changed files with 1 additions and 39 deletions

View File

@ -1,37 +0,0 @@
From b1057f1a37c10ba23855b2a264491cc4a3b45eca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juho=20H=C3=A4m=C3=A4l=C3=A4inen?=
<juho.hamalainen@jolla.com>
Date: Fri, 20 Aug 2021 12:55:40 +0300
Subject: [PATCH] bluetooth: Only remove cards belonging to the device.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Commit f89d64b98e12bb71b6aa94fcef31eafc060f9759 fixed a crash
when disabling adapters. However, now if any device is removed
ofono card is removed, even if it belongs to different device.
Add a check for the device being unlinked to our callback to fix.
Signed-off-by: Juho Hämäläinen <juho.hamalainen@jolla.com>
Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/624>
---
src/modules/bluetooth/backend-ofono.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/modules/bluetooth/backend-ofono.c b/src/modules/bluetooth/backend-ofono.c
index 2a212eca03b4..36fe787cf9b1 100644
--- a/src/modules/bluetooth/backend-ofono.c
+++ b/src/modules/bluetooth/backend-ofono.c
@@ -250,6 +250,9 @@ static pa_hook_result_t device_unlink_cb(pa_bluetooth_discovery *y, const pa_blu
pa_assert(d);
pa_assert(card);
+ if (d != card->transport->device)
+ return PA_HOOK_OK;
+
hf_audio_agent_card_removed(card->backend, card->path);
return PA_HOOK_OK;
--
2.27.0

View File

@ -1,4 +1,4 @@
# Copyright (C) 2019-2022, Digi International Inc.
# Copyright (C) 2019-2024, Digi International Inc.
FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
@ -27,7 +27,6 @@ AUDIO_HDMI ?= ""
AUDIO_HDMI:ccimx6 = "yes"
SRC_URI:append = " \
file://0001-bluetooth-Only-remove-cards-belonging-to-the-device.patch \
${@oe.utils.conditional('SOUND_CARD', 'sgtl5000', '${CFG_SGTL5000}', '', d)} \
${@oe.utils.conditional('SOUND_CARD', 'max98089', '${CFG_MAX98089}', '', d)} \
${@oe.utils.conditional('AUDIO_HDMI', 'yes', '${CFG_HDMI}', '', d)} \