summaryrefslogtreecommitdiff
path: root/sound/drivers/mpu401/mpu401_uart.c
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2007-10-11 16:42:23 +0400
committerJaroslav Kysela <perex@perex.cz>2007-10-16 18:51:14 +0400
commitc1099fcb74ddc005c85beaef33bbe68c9bf3b5bb (patch)
tree7a5e2723cfcbb47a2bbfbc63ce029d3353708fbd /sound/drivers/mpu401/mpu401_uart.c
parent69d8d3eb4df40194485b842c00047bb80e51c6a8 (diff)
downloadlinux-c1099fcb74ddc005c85beaef33bbe68c9bf3b5bb.tar.xz
[ALSA] mpu-401: remove MPU401_INFO_UART_ONLY flag
Since the last patch made the ENTER_UART command optional, the enter_uart option and its corresponding flag have become superfluous. The uart_enter option remains for backward compatibility but just prints a warning when used. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/drivers/mpu401/mpu401_uart.c')
-rw-r--r--sound/drivers/mpu401/mpu401_uart.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/drivers/mpu401/mpu401_uart.c b/sound/drivers/mpu401/mpu401_uart.c
index b5c5dd1e61bd..43c6f207c3c2 100644
--- a/sound/drivers/mpu401/mpu401_uart.c
+++ b/sound/drivers/mpu401/mpu401_uart.c
@@ -270,8 +270,7 @@ static int snd_mpu401_do_reset(struct snd_mpu401 *mpu)
{
if (snd_mpu401_uart_cmd(mpu, MPU401_RESET, 1))
return -EIO;
- if (!(mpu->info_flags & MPU401_INFO_UART_ONLY) &&
- snd_mpu401_uart_cmd(mpu, MPU401_ENTER_UART, 0))
+ if (snd_mpu401_uart_cmd(mpu, MPU401_ENTER_UART, 0))
return -EIO;
return 0;
}