Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/lmb-2.6

[linux-2.6] / sound / pci / hda / hda_intel.c

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index a1098bb875deaa01d7b423bb1ea74b466294309e..4be36c84b36c7c8354a707d9956430602de45e73 100644 (file)
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1818,7 +1818,7 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
                 */
                chip->playback_streams = (gcap & (0xF << 12)) >> 12;
                chip->capture_streams = (gcap & (0xF << 8)) >> 8;
-               chip->playback_index_offset = (gcap & (0xF << 12)) >> 12;
+               chip->playback_index_offset = chip->capture_streams;
                chip->capture_index_offset = 0;
        } else {
                /* gcap didn't give any info, switching to old method */