summaryrefslogtreecommitdiffstats
path: root/modules/usbaudio
diff options
context:
space:
mode:
authorPaul McLean <pmclean@google.com>2014-08-13 15:32:34 -0700
committerGlenn Kasten <gkasten@google.com>2014-08-13 23:08:41 +0000
commit93d4e0db0e308d6295e11e7c4eed5f007c9a1b1f (patch)
treee286ab415db20c935e740ff206ced76515f63602 /modules/usbaudio
parentaf5187efbddfe7d47238ed28e48b13ca4b96b9fe (diff)
downloadhardware_libhardware-93d4e0db0e308d6295e11e7c4eed5f007c9a1b1f.zip
hardware_libhardware-93d4e0db0e308d6295e11e7c4eed5f007c9a1b1f.tar.gz
hardware_libhardware-93d4e0db0e308d6295e11e7c4eed5f007c9a1b1f.tar.bz2
Fix problem with reloading config of new capture devices
with same card/device numbers. Bug: 17012657 Change-Id: I7cb50aedc538d8c648e7f66c8e153cf47ce12577
Diffstat (limited to 'modules/usbaudio')
-rw-r--r--modules/usbaudio/audio_hw.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/usbaudio/audio_hw.c b/modules/usbaudio/audio_hw.c
index 594f4bc..7e65ab5 100644
--- a/modules/usbaudio/audio_hw.c
+++ b/modules/usbaudio/audio_hw.c
@@ -714,8 +714,7 @@ static int in_set_parameters(struct audio_stream *stream, const char *kvpairs)
if (param_val >= 0)
device = atoi(value);
- if ((card >= 0) && (card != in->profile->card) &&
- (device >= 0) && (device != in->profile->device)) {
+ if (card >= 0 && device >= 0) {
/* cannot read pcm device info if playback is active */
if (!in->standby)
ret_value = -ENOSYS;