summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2016-08-18 08:41:38 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2016-09-29 14:48:04 +0200
commitfc94b2d37963c4ddc43c3f78701cbf744923b7eb (patch)
tree14f40a2f8c829355f925ef4dded2204f6a23d9e4 /sound
parent5f4a116fedade6369ac4835b388318720a43da36 (diff)
asoc: tegra: fix gcc-6 compilation
sound/soc/tegra/tegra30_dam.c: In function 'tegra30_dam_probe': sound/soc/tegra/tegra30_dam.c:620:3: error: this 'if' clause does not guard... [-Werror=misleading-indentation] if ((i == TEGRA30_DAM_CTRL_RSVD_6) || ^~ sound/soc/tegra/tegra30_dam.c:624:4: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'if' dam->reg_cache[i] = ^~~ Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/tegra/tegra30_dam.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/tegra/tegra30_dam.c b/sound/soc/tegra/tegra30_dam.c
index 8460266d0d66..19ec176a570e 100644
--- a/sound/soc/tegra/tegra30_dam.c
+++ b/sound/soc/tegra/tegra30_dam.c
@@ -618,11 +618,10 @@ static int __devinit tegra30_dam_probe(struct platform_device *pdev)
for (i = 0; i <= TEGRA30_DAM_CTRL_REGINDEX; i++) {
if ((i == TEGRA30_DAM_CTRL_RSVD_6) ||
- (i == TEGRA30_DAM_CTRL_RSVD_10))
+ (i == TEGRA30_DAM_CTRL_RSVD_10))
continue;
- dam->reg_cache[i] =
- tegra30_dam_readl(dam, i << 2);
+ dam->reg_cache[i] = tegra30_dam_readl(dam, i << 2);
}
tegra30_dam_disable_clock(pdev->id);