src/modules/alsa/alsa-mixer.c | 7 ++----- src/modules/alsa/alsa-ucm.c | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-)
New commits: commit f506203fcdf3949fb8caaab8830370093644d66e Author: Arun Raghavan <[email protected]> Date: Tue Aug 25 21:12:05 2015 +0530 alsa: Clarify potentially confusing device port data field The meaning of the code is unchanged here, but it is clearer that the PA_DEVICE_PORT_DATA field is a struct ucm_port pointer. diff --git a/src/modules/alsa/alsa-ucm.c b/src/modules/alsa/alsa-ucm.c index c231bb4..ff5693d 100644 --- a/src/modules/alsa/alsa-ucm.c +++ b/src/modules/alsa/alsa-ucm.c @@ -769,7 +769,7 @@ static void ucm_add_port_combination( pa_device_port_new_data_set_description(&port_data, desc); pa_device_port_new_data_set_direction(&port_data, is_sink ? PA_DIRECTION_OUTPUT : PA_DIRECTION_INPUT); - port = pa_device_port_new(core, &port_data, sizeof(ucm_port)); + port = pa_device_port_new(core, &port_data, sizeof(struct ucm_port *)); pa_device_port_new_data_done(&port_data); ucm_port = ucm_port_new(context->ucm, port, pdevices, num); commit 5071960bf33efe4889ed920593386c12821d3a11 Author: Arun Raghavan <[email protected]> Date: Tue Aug 25 19:27:24 2015 +0530 alsa-mixer: Drop redundant conditional frees The dynarrays are allocated unconditionally, so the free need not be conditional. diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c index a0b2493..425c5e6 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); _______________________________________________ pulseaudio-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/pulseaudio-commits
