aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-18 14:17:14 +0100
committerMark Brown <broonie@linaro.org>2013-10-18 14:17:14 +0100
commit2a5e9dab9acfb76cf0a4f96a9a17dc6eab2e472b (patch)
tree597933dc20456219f38173b640a8a07e83c2f1b8 /sound
parentd55f0691c041dba46daad7790b8f2631acb55f9a (diff)
parentc5d5a58d7ff977289c4bba8eae447c9afa66516b (diff)
downloadlinux-linaro-stable-2a5e9dab9acfb76cf0a4f96a9a17dc6eab2e472b.tar.gz
Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/sh/rcar/rsnd.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index 9cc6986a8cfb..5dd87f4c919e 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -220,8 +220,8 @@ int rsnd_gen_path_exit(struct rsnd_priv *priv,
void __iomem *rsnd_gen_reg_get(struct rsnd_priv *priv,
struct rsnd_mod *mod,
enum rsnd_reg reg);
-#define rsnd_is_gen1(s) ((s)->info->flags & RSND_GEN1)
-#define rsnd_is_gen2(s) ((s)->info->flags & RSND_GEN2)
+#define rsnd_is_gen1(s) (((s)->info->flags & RSND_GEN_MASK) == RSND_GEN1)
+#define rsnd_is_gen2(s) (((s)->info->flags & RSND_GEN_MASK) == RSND_GEN2)
/*
* R-Car ADG