Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'soundwire-5.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire into char-misc-linus

Vinod writes:

soundwire fixes for v5.2-rc4

Srinivas Kandagatla fixed by bunch of issues, two in core for locking
and out of bound access and one in intel driver copy-paste

* tag 'soundwire-5.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire:
soundwire: intel: set dai min and max channels correctly
soundwire: stream: fix bad unlock balance
soundwire: stream: fix out of boundary access on port properties

+5 -6
+2 -2
drivers/soundwire/intel.c
··· 715 715 return -ENOMEM; 716 716 } 717 717 718 - dais[i].playback.channels_min = 1; 719 - dais[i].playback.channels_max = max_ch; 718 + dais[i].capture.channels_min = 1; 719 + dais[i].capture.channels_max = max_ch; 720 720 dais[i].capture.rates = SNDRV_PCM_RATE_48000; 721 721 dais[i].capture.formats = SNDRV_PCM_FMTBIT_S16_LE; 722 722 }
+3 -4
drivers/soundwire/stream.c
··· 814 814 goto error; 815 815 } 816 816 817 - mutex_unlock(&bus->msg_lock); 817 + if (bus->multi_link) 818 + mutex_unlock(&bus->msg_lock); 818 819 } 819 820 820 821 return ret; ··· 1407 1406 } 1408 1407 1409 1408 for (i = 0; i < num_ports; i++) { 1410 - dpn_prop = &dpn_prop[i]; 1411 - 1412 - if (dpn_prop->num == port_num) 1409 + if (dpn_prop[i].num == port_num) 1413 1410 return &dpn_prop[i]; 1414 1411 } 1415 1412