Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ae2caff authored by Mark Brown's avatar Mark Brown
Browse files

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

parents bf612730 34e44475

include/sound/rcar_snd.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

sound/soc/sh/rcar/scu.c

+2 −2
Original line number Diff line number Diff line
@@ -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));