summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArun Raghavan <git@arunraghavan.net>2015-08-25 19:27:24 +0530
committerArun Raghavan <git@arunraghavan.net>2015-08-25 19:27:58 +0530
commit5071960bf33efe4889ed920593386c12821d3a11 (patch)
treebaeee8f59d4ccf9523faebc48d90b942e7eecfb0
parent38e81f4c3dd1751fa78480daee3c71b73b45f7a7 (diff)
downloadpulseaudio-5071960bf33efe4889ed920593386c12821d3a11.tar.gz
alsa-mixer: Drop redundant conditional frees
The dynarrays are allocated unconditionally, so the free need not be conditional.
-rw-r--r--src/modules/alsa/alsa-mixer.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index a0b2493b7..425c5e6f3 100644
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -127,11 +127,8 @@ pa_alsa_jack *pa_alsa_jack_new(pa_alsa_path *path, const char *name) {
void pa_alsa_jack_free(pa_alsa_jack *jack) {
pa_assert(jack);
- if (jack->ucm_hw_mute_devices)
- pa_dynarray_free(jack->ucm_hw_mute_devices);
-
- if (jack->ucm_devices)
- pa_dynarray_free(jack->ucm_devices);
+ pa_dynarray_free(jack->ucm_hw_mute_devices);
+ pa_dynarray_free(jack->ucm_devices);
pa_xfree(jack->alsa_name);
pa_xfree(jack->name);