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

Commit df2fff8d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm: qdsp6v2: Add TrueHD to compressed open"

parents abb1d6be 4d021085

sound/soc/msm/qdsp6v2/q6asm.c

+3 −4
Original line number Diff line number Diff line
@@ -2609,7 +2609,9 @@ int q6asm_open_write_compressed(struct audio_client *ac, uint32_t format, 
	case FORMAT_GEN_COMPR:

		open.fmt_id = ASM_MEDIA_FMT_GENERIC_COMPRESSED;

		break;



	case FORMAT_TRUEHD:

		open.fmt_id = ASM_MEDIA_FMT_TRUEHD;

		break;

	default:

		pr_err("%s: Invalid format[%d]\n", __func__, format);

		rc = -EINVAL;
@@ -2782,9 +2784,6 @@ static int __q6asm_open_write(struct audio_client *ac, uint32_t format, 
	case FORMAT_GEN_COMPR:

		open.dec_fmt_id = ASM_MEDIA_FMT_GENERIC_COMPRESSED;

		break;

	case FORMAT_TRUEHD:

		open.dec_fmt_id = ASM_MEDIA_FMT_TRUEHD;

		break;

	default:

		pr_err("%s: Invalid format 0x%x\n", __func__, format);

		rc = -EINVAL;