[ALSA] ice1712 - Set mpu401 info flags from _card_info

To permit use, in ice1712, of the mpu401 info flags recently added to
mpu401_uart, adds info_flags in snd_ice1712_card_info so that additional
flags can be set, if desired.  'MPU401_INFO_INTEGRATED' is always set with
the ice1712.  The flags are passed on to snd_mpu401_uart_new().
_INFO_OUTPUT is set for DMX6fire mpu2.

Signed-off-by: Alan Horstmann <gineera@aspect135.co.uk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 4 insertions, 3 deletions

diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index aa5a41fecb08..845907159b74 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -61,7 +61,6 @@
 #include <sound/core.h>
 #include <sound/cs8427.h>
 #include <sound/info.h>
-#include <sound/mpu401.h>
 #include <sound/initval.h>
 
 #include <sound/asoundef.h>
@@ -2739,7 +2738,8 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci,
         if (! c->no_mpu401) {
                 if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_ICE1712,
                                                ICEREG(ice, MPU1_CTRL),
-                                               MPU401_INFO_INTEGRATED,
+                                               (c->mpu401_1_info_flags |
+                                                MPU401_INFO_INTEGRATED),
                                                ice->irq, 0,
                                                &ice->rmidi[0])) < 0) {
                         snd_card_free(card);
@@ -2755,7 +2755,8 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci,
                         /*  2nd port used  */
                         if ((err = snd_mpu401_uart_new(card, 1, MPU401_HW_ICE1712,
                                                        ICEREG(ice, MPU2_CTRL),
-                                                       MPU401_INFO_INTEGRATED,
+                                                       (c->mpu401_2_info_flags |
+                                                        MPU401_INFO_INTEGRATED),
                                                        ice->irq, 0,
                                                        &ice->rmidi[1])) < 0) {
                                 snd_card_free(card);