From 93fc5537826cd295bc63cb36e01d538fd520c589 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 3 Mar 2009 15:00:35 +0100 Subject: [PATCH] --- yaml --- r: 133095 b: refs/heads/master c: 82ad39f9391fca1d3177bd9f6a5264eff5b5346a h: refs/heads/master i: 133093: c9dec8ddfb8e7025fbe57ddacab78921ddae3d57 133091: 6b094b471214c1b637b8525f7263eeba7460f98a 133087: cc8bedac3533b901e6587ac770e182f2c3e93c3f v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/hda_codec.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 7e42505c9d4a..fd1da3b9eff4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d02b1f3910f12cfe377a31afebcbbde4f5664b74 +refs/heads/master: 82ad39f9391fca1d3177bd9f6a5264eff5b5346a diff --git a/trunk/sound/pci/hda/hda_codec.c b/trunk/sound/pci/hda/hda_codec.c index 7c9ef5c18e77..04cb1251e3e7 100644 --- a/trunk/sound/pci/hda/hda_codec.c +++ b/trunk/sound/pci/hda/hda_codec.c @@ -2776,13 +2776,10 @@ static int get_empty_pcm_device(struct hda_bus *bus, int type) for (i = 0; i < ARRAY_SIZE(audio_idx); i++) { dev = audio_idx[i]; if (!test_bit(dev, bus->pcm_dev_bits)) - break; - } - if (i >= ARRAY_SIZE(audio_idx)) { - snd_printk(KERN_WARNING "Too many audio devices\n"); - return -EAGAIN; + goto ok; } - break; + snd_printk(KERN_WARNING "Too many audio devices\n"); + return -EAGAIN; case HDA_PCM_TYPE_SPDIF: case HDA_PCM_TYPE_HDMI: case HDA_PCM_TYPE_MODEM: @@ -2797,6 +2794,7 @@ static int get_empty_pcm_device(struct hda_bus *bus, int type) snd_printk(KERN_WARNING "Invalid PCM type %d\n", type); return -EINVAL; } + ok: set_bit(dev, bus->pcm_dev_bits); return dev; }