commit af5187efbddfe7d47238ed28e48b13ca4b96b9fe
author Paul McLean <pmclean@google.com> Tue Aug 12 13:57:10 2014 -0700
committer Paul McLean <pmclean@google.com> Tue Aug 12 13:57:10 2014 -0700
tree 0f4e0e7e1e675096c8239dd0aa85dbf8ab85cffe
parent 9605e80e18c5361d867d70b6c4ee8efd22dee058

Fix problem with reloading config of new devices with same card/device numbers.

Bug 16981885

Change-Id: I65c6c418ee0d0f42c87379b614f64302d27f8e77

modules/usbaudio/alsa_device_proxy.c

diff --git a/modules/usbaudio/alsa_device_proxy.c b/modules/usbaudio/alsa_device_proxy.c
index b887d1d..63a27e7 100644
--- a/modules/usbaudio/alsa_device_proxy.c
+++ b/modules/usbaudio/alsa_device_proxy.c
@@ -48,7 +48,7 @@
 
     proxy->profile = profile;
 
-#if LOG_PCM_PARAMS
+#ifdef LOG_PCM_PARAMS
     log_pcm_config(config, "proxy_setup()");
 #endif
 

modules/usbaudio/audio_hw.c

diff --git a/modules/usbaudio/audio_hw.c b/modules/usbaudio/audio_hw.c
index 22d5e0f..594f4bc 100644
--- a/modules/usbaudio/audio_hw.c
+++ b/modules/usbaudio/audio_hw.c
@@ -328,8 +328,7 @@
     if (param_val >= 0)
         device = atoi(value);
 
-    if ((card >= 0) && (card != out->profile->card) &&
-            (device >= 0) && (device != out->profile->device)) {
+    if (card >= 0 && device >= 0) {
         /* cannot read pcm device info if playback is active */
         if (!out->standby)
             ret_value = -ENOSYS;