From 1af46cd6851a829e9edc47a498b722c62a2ac150 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Mon, 6 Jun 2011 16:16:34 +0100 Subject: [PATCH] --- yaml --- r: 257495 b: refs/heads/master c: 88d960864e371d0caf1db69e6d1d740ad7a247ba h: refs/heads/master i: 257493: a049a74321f5969a48c87e870ecd56e64c9116b3 257491: 8c6bc01ef13a67db6109179428bca5846856ffae 257487: 3c5e15f34442400bf96f191ac075cdb52384d50c v: v3 --- [refs] | 2 +- trunk/sound/soc/soc-dapm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 27177e82f52a..6251b1d7a1fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dfcc9047c97ca99b151e30133c9bccf5ab258ca6 +refs/heads/master: 88d960864e371d0caf1db69e6d1d740ad7a247ba diff --git a/trunk/sound/soc/soc-dapm.c b/trunk/sound/soc/soc-dapm.c index 6be6546648c8..988cdffa8c4c 100644 --- a/trunk/sound/soc/soc-dapm.c +++ b/trunk/sound/soc/soc-dapm.c @@ -209,7 +209,7 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w, int val, item, bitmask; for (bitmask = 1; bitmask < e->max; bitmask <<= 1) - ; + ; val = snd_soc_read(w->codec, e->reg); item = (val >> e->shift_l) & (bitmask - 1);