Merge remote-tracking branch 'asoc/topic/ak4642' into asoc-next

805c6055 · Mark Brown · bb80a5d4 · 0feb23d1 · 805c6055
Commit 805c6055 authored Oct 24, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

sound/soc/codecs/ak4642.c sound/soc/codecs/ak4642.c +0 -2

No files found.
--- a/sound/soc/codecs/ak4642.c
+++ b/sound/soc/codecs/ak4642.c
@@ -352,7 +352,6 @@ static int ak4642_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
 	 */
 	default:
 		return -EINVAL;
-		break;
 	}
 	snd_soc_update_bits(codec, MD_CTL1, DIF_MASK, data);

@@ -405,7 +404,6 @@ static int ak4642_dai_hw_params(struct snd_pcm_substream *substream,
 		break;
 	default:
 		return -EINVAL;
-		break;
 	}
 	snd_soc_update_bits(codec, MD_CTL2, FS_MASK, rate);