diff options
| author |   Thierry Bultel <thierry.bultel@iot.bzh> | 2019-02-13 11:30:53 +0100 |
|---|---|---|
| committer | Thierry Bultel <thierry.bultel@iot.bzh> | 2019-02-18 15:51:30 +0100 |
| commit | edeccfc0d062117bdb74c86044e197372ca25885 (patch) | |
| tree | 188927e042902e0907d128aed5902a4b84ec0b39 /plugins/alsa/alsa-api-loop.c | |
| parent | 0e9718e4158355093b281c1376ba9b0ed049d447 (diff) | |
alsa-transaction: simplify the cleanup
This simplifies the invocation of cleanup, by only using
AlsaMixerTransactionDelete that performs the 3 actions
of cleanup, removal from list, and memory freeing.
Fixes a bug at MixerExit, because the first transaction was not
removed from the list and led to a double free error.
Also added a boolean parameter to AlsaMixerTransactionObjectDelete
(was AlsaMixerTransactionObjectForget before), that decides
wether or not the found object must be destroyed with its destructor
(for most of the cases) or simply freed in memory (which is needed
for loop device).
Change-Id: I2eacbf80a22e3d556dc432d393a1807fcd7c47fb
Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
Diffstat (limited to 'plugins/alsa/alsa-api-loop.c')
| -rw-r--r-- | plugins/alsa/alsa-api-loop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/alsa/alsa-api-loop.c b/plugins/alsa/alsa-api-loop.c index c0ea549..c601880 100644 --- a/plugins/alsa/alsa-api-loop.c +++ b/plugins/alsa/alsa-api-loop.c @@ -117,7 +117,7 @@ STATIC int CheckOneSubdev(SoftMixerT *mixer, AlsaSndLoopT *loop, AlsaLoopSubdevT pcmCtl->closeAtDeletion = true; // free PCM as we only open loop to assert it's a valid capture device - AlsaMixerTransactionObjectForget(mixer->transaction, pcmCtl); + AlsaMixerTransactionObjectDelete(mixer->transaction, pcmCtl, false); AlsaPcmCtlDelete(mixer, pcmCtl); return 0; |