diff options
Diffstat (limited to 'sound/soc/samsung/i2s.c')
-rw-r--r-- | sound/soc/samsung/i2s.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index 87a874dc7a35..6553b19c70c7 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * ALSA SoC Audio Layer - Samsung I2S Controller driver | 3 | * ALSA SoC Audio Layer - Samsung I2S Controller driver |
4 | * | 4 | * |
5 | * Copyright (c) 2010 Samsung Electronics Co. Ltd. | 5 | * Copyright (c) 2010 Samsung Electronics Co. Ltd. |
6 | * Jaswinder Singh <jassi.brar@samsung.com> | 6 | * Jaswinder Singh <jassisinghbrar@gmail.com> |
7 | * | 7 | * |
8 | * This program is free software; you can redistribute it and/or modify | 8 | * This program is free software; you can redistribute it and/or modify |
9 | * it under the terms of the GNU General Public License version 2 as | 9 | * it under the terms of the GNU General Public License version 2 as |
@@ -761,15 +761,13 @@ static int i2s_trigger(struct snd_pcm_substream *substream, | |||
761 | case SNDRV_PCM_TRIGGER_PAUSE_PUSH: | 761 | case SNDRV_PCM_TRIGGER_PAUSE_PUSH: |
762 | local_irq_save(flags); | 762 | local_irq_save(flags); |
763 | 763 | ||
764 | if (capture) | 764 | if (capture) { |
765 | i2s_rxctrl(i2s, 0); | 765 | i2s_rxctrl(i2s, 0); |
766 | else | ||
767 | i2s_txctrl(i2s, 0); | ||
768 | |||
769 | if (capture) | ||
770 | i2s_fifo(i2s, FIC_RXFLUSH); | 766 | i2s_fifo(i2s, FIC_RXFLUSH); |
771 | else | 767 | } else { |
768 | i2s_txctrl(i2s, 0); | ||
772 | i2s_fifo(i2s, FIC_TXFLUSH); | 769 | i2s_fifo(i2s, FIC_TXFLUSH); |
770 | } | ||
773 | 771 | ||
774 | local_irq_restore(flags); | 772 | local_irq_restore(flags); |
775 | break; | 773 | break; |
@@ -1143,7 +1141,7 @@ static struct platform_driver samsung_i2s_driver = { | |||
1143 | module_platform_driver(samsung_i2s_driver); | 1141 | module_platform_driver(samsung_i2s_driver); |
1144 | 1142 | ||
1145 | /* Module information */ | 1143 | /* Module information */ |
1146 | MODULE_AUTHOR("Jaswinder Singh, <jassi.brar@samsung.com>"); | 1144 | MODULE_AUTHOR("Jaswinder Singh, <jassisinghbrar@gmail.com>"); |
1147 | MODULE_DESCRIPTION("Samsung I2S Interface"); | 1145 | MODULE_DESCRIPTION("Samsung I2S Interface"); |
1148 | MODULE_ALIAS("platform:samsung-i2s"); | 1146 | MODULE_ALIAS("platform:samsung-i2s"); |
1149 | MODULE_LICENSE("GPL"); | 1147 | MODULE_LICENSE("GPL"); |