diff options
author | Jassi Brar <jaswinder.singh@linaro.org> | 2012-02-25 06:12:34 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-29 18:37:28 -0500 |
commit | c90887fe982e46d1b23e151636616d4e4a0077a4 (patch) | |
tree | 1bacb1b79c5391ac153ef3d6e92e2304eea6b0b6 /sound/soc/samsung/i2s.c | |
parent | 62172f4a750e28c5573b3402c3fe3f029b5dd67b (diff) |
ASoC: Samsung: Merge two identical if-else clauses
Saves two lines and a hell of a lot of embarrassment looking at the code.
Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/samsung/i2s.c')
-rw-r--r-- | sound/soc/samsung/i2s.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index 87a874dc7a35..ea5ccaec83fc 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c | |||
@@ -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; |