diff options
Diffstat (limited to 'meta/recipes-multimedia/pulseaudio/pulseaudio/0002-card-don-t-allow-the-CARD_NEW-hook-to-fail.patch')
-rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio/0002-card-don-t-allow-the-CARD_NEW-hook-to-fail.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/0002-card-don-t-allow-the-CARD_NEW-hook-to-fail.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio/0002-card-don-t-allow-the-CARD_NEW-hook-to-fail.patch deleted file mode 100644 index 80c291f821..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio/0002-card-don-t-allow-the-CARD_NEW-hook-to-fail.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From d4e6d07fef28d1bd8bfbceab4cc196ef54c23dd8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Tanu Kaskinen <tanuk@iki.fi> | ||
3 | Date: Tue, 7 Jun 2016 16:51:00 +0300 | ||
4 | Subject: [PATCH 2/5] card: don't allow the CARD_NEW hook to fail | ||
5 | |||
6 | There is currently no use for allowing modules to cancel card creation, | ||
7 | and I don't see need for that in the future either. Let's simplify | ||
8 | things by removing the failure handling code. | ||
9 | |||
10 | Upstream-Status: Accepted [expected in 10.0] | ||
11 | |||
12 | Signed-off-by: Tanu Kaskinen <tanuk@iki.fi> | ||
13 | --- | ||
14 | src/pulsecore/card.c | 7 +------ | ||
15 | 1 file changed, 1 insertion(+), 6 deletions(-) | ||
16 | |||
17 | diff --git a/src/pulsecore/card.c b/src/pulsecore/card.c | ||
18 | index 410746b..0ac70b9 100644 | ||
19 | --- a/src/pulsecore/card.c | ||
20 | +++ b/src/pulsecore/card.c | ||
21 | @@ -149,12 +149,7 @@ pa_card *pa_card_new(pa_core *core, pa_card_new_data *data) { | ||
22 | } | ||
23 | |||
24 | pa_card_new_data_set_name(data, name); | ||
25 | - | ||
26 | - if (pa_hook_fire(&core->hooks[PA_CORE_HOOK_CARD_NEW], data) < 0) { | ||
27 | - pa_xfree(c); | ||
28 | - pa_namereg_unregister(core, name); | ||
29 | - return NULL; | ||
30 | - } | ||
31 | + pa_hook_fire(&core->hooks[PA_CORE_HOOK_CARD_NEW], data); | ||
32 | |||
33 | c->core = core; | ||
34 | c->name = pa_xstrdup(data->name); | ||
35 | -- | ||
36 | 2.8.1 | ||
37 | |||