1 files changed, 6 insertions, 4 deletions

diff --git a/sound/drivers/mpu401/mpu401.c b/sound/drivers/mpu401/mpu401.c
index 67c6e9745418..1fc95dadde1d 100644
--- a/sound/drivers/mpu401/mpu401.c
+++ b/sound/drivers/mpu401/mpu401.c
@@ -1,6 +1,6 @@
 /*
  *  Driver for generic MPU-401 boards (UART mode only)
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Copyright (c) 2004 by Castet Matthieu <castet.matthieu@free.fr>
  *
  *
@@ -30,7 +30,7 @@
 #include <sound/mpu401.h>
 #include <sound/initval.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("MPU-401 UART");
 MODULE_LICENSE("GPL");
 
@@ -70,6 +70,9 @@ static int snd_mpu401_create(int dev, struct snd_card **rcard)
         struct snd_card *card;
         int err;
 
+        if (!uart_enter[dev])
+                snd_printk(KERN_ERR "the uart_enter option is obsolete; remove it\n");
+
         *rcard = NULL;
         card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
         if (card == NULL)
@@ -83,8 +86,7 @@ static int snd_mpu401_create(int dev, struct snd_card **rcard)
                 strcat(card->longname, "polled");
         }
 
-        err = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401, port[dev],
-                                  uart_enter[dev] ? 0 : MPU401_INFO_UART_ONLY,
+        err = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401, port[dev], 0,
                                   irq[dev], irq[dev] >= 0 ? IRQF_DISABLED : 0,
                                   NULL);
         if (err < 0) {