diff options
| author | Jassi Brar <jaswinder.singh@linaro.org> | 2012-02-25 16:42:34 +0530 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-29 23:37:28 +0000 |
| commit | c90887fe982e46d1b23e151636616d4e4a0077a4 (patch) | |
| tree | 1bacb1b79c5391ac153ef3d6e92e2304eea6b0b6 /sound/soc/samsung | |
| parent | 62172f4a750e28c5573b3402c3fe3f029b5dd67b (diff) | |
| download | linux-3.10-c90887fe982e46d1b23e151636616d4e4a0077a4.tar.gz linux-3.10-c90887fe982e46d1b23e151636616d4e4a0077a4.tar.bz2 linux-3.10-c90887fe982e46d1b23e151636616d4e4a0077a4.zip | |
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')
| -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 87a874dc7a3..ea5ccaec83f 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, case SNDRV_PCM_TRIGGER_PAUSE_PUSH: local_irq_save(flags); - if (capture) + if (capture) { i2s_rxctrl(i2s, 0); - else - i2s_txctrl(i2s, 0); - - if (capture) i2s_fifo(i2s, FIC_RXFLUSH); - else + } else { + i2s_txctrl(i2s, 0); i2s_fifo(i2s, FIC_TXFLUSH); + } local_irq_restore(flags); break; |