renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-21 11:44:01 +08:00
Code

Merge remote-tracking branch 'asoc/fix/rsnd' into asoc-linus

Browse Source
This commit is contained in:
Mark Brown 2013-09-11 11:17:17 +01:00
commit 2ae2caff83
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sound/rcar_snd.h
View File

@ -55,7 +55,7 @@ struct rsnd_ssi_platform_info {
/*
* flags
*/
#define RSND_SCU_USB_HPBIF (1 << 31) /* it needs RSND_SSI_DEPENDENT */
#define RSND_SCU_USE_HPBIF (1 << 31) /* it needs RSND_SSI_DEPENDENT */
struct rsnd_scu_platform_info {
u32 flags;

4
sound/soc/sh/rcar/scu.c
View File

@ -157,9 +157,9 @@ static int rsnd_scu_start(struct rsnd_mod *mod,
int ret;
/*
* SCU will be used if it has RSND_SCU_USB_HPBIF flags
* SCU will be used if it has RSND_SCU_USE_HPBIF flags
*/
if (!(flags & RSND_SCU_USB_HPBIF)) {
if (!(flags & RSND_SCU_USE_HPBIF)) {
/* it use PIO transter */
dev_dbg(dev, "%s%d is not used\n",
rsnd_mod_name(mod), rsnd_mod_id(mod));