summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2007-08-15 08:38:32 +0000
committerJohan Hedberg <johan.hedberg@nokia.com>2007-08-15 08:38:32 +0000
commitb45b19f412b9f8d18181ff450bfce2f0f21fb561 (patch)
tree6f1d393515cedb802f8955d5ee40394a07aa4875
parentd661010f0da37d072e9f3e0adcc94964fea6a054 (diff)
A2DP specific cleanup callback is unnecessary after the previous fix to bluetooth_exit
-rw-r--r--audio/pcm_bluetooth.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/audio/pcm_bluetooth.c b/audio/pcm_bluetooth.c
index e7fa6878..7977c1a6 100644
--- a/audio/pcm_bluetooth.c
+++ b/audio/pcm_bluetooth.c
@@ -168,15 +168,6 @@ static int bluetooth_close(snd_pcm_ioplug_t *io)
return 0;
}
-static int bluetooth_a2dp_close(snd_pcm_ioplug_t *io)
-{
- struct bluetooth_data *data = io->private_data;
-
- sbc_finish(&data->a2dp.sbc);
-
- return bluetooth_close(io);
-}
-
static int bluetooth_prepare(snd_pcm_ioplug_t *io)
{
struct bluetooth_data *data = io->private_data;
@@ -584,7 +575,7 @@ static snd_pcm_ioplug_callback_t bluetooth_a2dp_playback = {
.start = bluetooth_start,
.stop = bluetooth_stop,
.pointer = bluetooth_pointer,
- .close = bluetooth_a2dp_close,
+ .close = bluetooth_close,
.hw_params = bluetooth_a2dp_hw_params,
.prepare = bluetooth_prepare,
.transfer = bluetooth_a2dp_write,
@@ -594,7 +585,7 @@ static snd_pcm_ioplug_callback_t bluetooth_a2dp_capture = {
.start = bluetooth_start,
.stop = bluetooth_stop,
.pointer = bluetooth_pointer,
- .close = bluetooth_a2dp_close,
+ .close = bluetooth_close,
.hw_params = bluetooth_a2dp_hw_params,
.prepare = bluetooth_prepare,
.transfer = bluetooth_a2dp_read,