diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 09:38:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 09:38:52 -0700 |
| commit | 25a025863e024f6b86b48137b10b4960c50351b0 (patch) | |
| tree | 72d2521585f61d904769d28cf1d7687b949a61a6 /sound/pci/ice1712/ice1724.c | |
| parent | 1f43c5393033de90bac4410352b1d2a69dcbe7ef (diff) | |
| parent | 7e48bf653c37eb32c2ba4c13f15aa154aa807e61 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
[ALSA] soc - wm9712 - checkpatch fixes
[ALSA] pcsp - Fix more dependency
[ALSA] hda - Add support of Medion RIM 2150
[ALSA] ASoC: Add drivers for the Texas Instruments OMAP processors
[ALSA] ice1724 - Enable watermarks
[ALSA] Add MPU401_INFO_NO_ACK bitflag
Diffstat (limited to 'sound/pci/ice1712/ice1724.c')
| -rw-r--r-- | sound/pci/ice1712/ice1724.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index 4490422fb93..67350901772 100644 --- a/sound/pci/ice1712/ice1724.c +++ b/sound/pci/ice1712/ice1724.c @@ -2429,6 +2429,7 @@ static int __devinit snd_vt1724_probe(struct pci_dev *pci, if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_ICE1712, ICEREG1724(ice, MPU_CTRL), (MPU401_INFO_INTEGRATED | + MPU401_INFO_NO_ACK | MPU401_INFO_TX_IRQ), ice->irq, 0, &ice->rmidi[0])) < 0) { @@ -2442,12 +2443,10 @@ static int __devinit snd_vt1724_probe(struct pci_dev *pci, outb(inb(ICEREG1724(ice, IRQMASK)) & ~(VT1724_IRQ_MPU_RX | VT1724_IRQ_MPU_TX), ICEREG1724(ice, IRQMASK)); -#if 0 /* for testing */ /* set watermarks */ outb(VT1724_MPU_RX_FIFO | 0x1, ICEREG1724(ice, MPU_FIFO_WM)); outb(0x1, ICEREG1724(ice, MPU_FIFO_WM)); -#endif } } |