xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 5.4-rc7 into char-misc-next

Browse Source 
We need the char/misc driver fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2019-11-11 06:24:30 +01:00
parent a61ead03a6 31f4f5b495
commit 01b59c763f
691 changed files with 9433 additions and 3245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/soundwire/intel.c
View File

@@ -810,7 +810,7 @@ static int intel_register_dai(struct sdw_intel *sdw)
/* Create PCM DAIs */
stream = &cdns->pcm;
ret = intel_create_dai(cdns, dais, INTEL_PDI_IN, stream->num_in,
ret = intel_create_dai(cdns, dais, INTEL_PDI_IN, cdns->pcm.num_in,
off, stream->num_ch_in, true);
if (ret)
return ret;
@@ -841,7 +841,7 @@ static int intel_register_dai(struct sdw_intel *sdw)
if (ret)
return ret;
off += cdns->pdm.num_bd;
off += cdns->pdm.num_out;
ret = intel_create_dai(cdns, dais, INTEL_PDI_BD, cdns->pdm.num_bd,
off, stream->num_ch_bd, false);
if (ret)