diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-11 06:17:17 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-11 06:17:17 -0400 |
| commit | 2ae2caff8348378c9e464353e9860ee97583c00b (patch) | |
| tree | 189d100b8eb9dbfed0500ac5773596fe78030ef2 | |
| parent | bf612730bf2e760688a14060a8356229bbb0fa5f (diff) | |
| parent | 34e4447515a18e0602f6df1a08b6a6ea63dea14b (diff) | |
Merge remote-tracking branch 'asoc/fix/rsnd' into asoc-linus
| -rw-r--r-- | include/sound/rcar_snd.h | 2 | ||||
| -rw-r--r-- | sound/soc/sh/rcar/scu.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/sound/rcar_snd.h b/include/sound/rcar_snd.h index d35412ae03b3..fe66533e9b7a 100644 --- a/include/sound/rcar_snd.h +++ b/include/sound/rcar_snd.h | |||
| @@ -55,7 +55,7 @@ struct rsnd_ssi_platform_info { | |||
| 55 | /* | 55 | /* |
| 56 | * flags | 56 | * flags |
| 57 | */ | 57 | */ |
| 58 | #define RSND_SCU_USB_HPBIF (1 << 31) /* it needs RSND_SSI_DEPENDENT */ | 58 | #define RSND_SCU_USE_HPBIF (1 << 31) /* it needs RSND_SSI_DEPENDENT */ |
| 59 | 59 | ||
| 60 | struct rsnd_scu_platform_info { | 60 | struct rsnd_scu_platform_info { |
| 61 | u32 flags; | 61 | u32 flags; |
diff --git a/sound/soc/sh/rcar/scu.c b/sound/soc/sh/rcar/scu.c index 184d9008cecd..2df2e9150b89 100644 --- a/sound/soc/sh/rcar/scu.c +++ b/sound/soc/sh/rcar/scu.c | |||
| @@ -157,9 +157,9 @@ static int rsnd_scu_start(struct rsnd_mod *mod, | |||
| 157 | int ret; | 157 | int ret; |
| 158 | 158 | ||
| 159 | /* | 159 | /* |
| 160 | * SCU will be used if it has RSND_SCU_USB_HPBIF flags | 160 | * SCU will be used if it has RSND_SCU_USE_HPBIF flags |
| 161 | */ | 161 | */ |
| 162 | if (!(flags & RSND_SCU_USB_HPBIF)) { | 162 | if (!(flags & RSND_SCU_USE_HPBIF)) { |
| 163 | /* it use PIO transter */ | 163 | /* it use PIO transter */ |
| 164 | dev_dbg(dev, "%s%d is not used\n", | 164 | dev_dbg(dev, "%s%d is not used\n", |
| 165 | rsnd_mod_name(mod), rsnd_mod_id(mod)); | 165 | rsnd_mod_name(mod), rsnd_mod_id(mod)); |