greybus: gb-audio: Activate TX connection Bundle CPort ID
Currently, the audio driver activates & deactivates a predefined
CPort ID but that can vary depending on the manifest data of the
module. Instead, use the TX connection's Bundle CPort ID which
contains the correct CPort ID.
Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
Acked-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
diff --git a/drivers/staging/greybus/audio-pcm.c b/drivers/staging/greybus/audio-pcm.c
index 8eb803a..30030f8 100644
--- a/drivers/staging/greybus/audio-pcm.c
+++ b/drivers/staging/greybus/audio-pcm.c
@@ -42,8 +42,8 @@
if (!atomic_read(&snd_dev->running)) {
if (snd_dev->cport_active) {
ret = gb_i2s_mgmt_deactivate_cport(
- snd_dev->mgmt_connection,
- CONFIG_I2S_REMOTE_DATA_CPORT);
+ snd_dev->mgmt_connection,
+ snd_dev->i2s_tx_connection->bundle_cport_id);
if (ret) /* XXX Do what else with failure? */
pr_err("deactivate_cport failed: %d\n", ret);
@@ -53,7 +53,7 @@
return;
} else if (!snd_dev->cport_active) {
ret = gb_i2s_mgmt_activate_cport(snd_dev->mgmt_connection,
- CONFIG_I2S_REMOTE_DATA_CPORT);
+ snd_dev->i2s_tx_connection->bundle_cport_id);
if (ret)
pr_err("activate_cport failed: %d\n", ret);