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 -----BEGIN PGP SIGNATURE----- iQIcBAABAgAGBQJc+jOcAAoJEHwUBw8lI4NHvGgQAKqDZUy+NJ7x1s0CicIav5OK yV8V9rSZk8OfztFm2SuoyqFbEQgODvQwiVd4z4yfq+1KT21oUVO1rgU+u2IkQoaQ ki0oKOjydsH4ph6L6ZITCnNg/oBhvb9GRjDzXwVu/24BSrhTSeSqKVZplW8tbr/n h+6iHDogNm3cD+2tHcE1q2hFUh+6Os2n3dqnu8lRmKktFi+bYdR2UUZSQ7WYM2Dp u8jDVp0CmrP/s2cv0USEyif/Wmuy5CCv1L4PVS0Qb3opzGLdkiwF8wGhIhhnn22O YbtQOJDQvTZYGHnoBLcDXRbtIpaJ4YVg5ETK9Z6NR1l9Doi7aHo22q/durPOUYzF KGcFzkZFlgMW+CEaDeH/GAxtdz8PnchnwPnfFKu5K66MCNYSwokBdwn78qSZdXMX bqLmU95+ZLV3aq2iMjHGm8KegT5hiwhZElz77wZmbXcvleAyT8uXbgDRIPZVK/yF pBm8RnP1Bn1VZ0oWH9T/8rQBR9hMDmuabbbnF2xasUVXXV36alfEpOkoIcXwOZes 7KFXweQ8ExM7ybX8rW0u/JkMIpXHy5Eys6CkkqntH/im8Nf6Eh0F9U+scN3NuNRU VPHPb8RD7aL9Banqqok5hKYfAhOmxDlRUgTFnB6XQ9HaPqHnPjle9oTHleXGLtzt jEPWVLIbReBf/YIDdf1z =zA8C -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
b7108486d2
|
@ -715,8 +715,8 @@ static int intel_create_dai(struct sdw_cdns *cdns,
|
|||
return -ENOMEM;
|
||||
}
|
||||
|
||||
dais[i].playback.channels_min = 1;
|
||||
dais[i].playback.channels_max = max_ch;
|
||||
dais[i].capture.channels_min = 1;
|
||||
dais[i].capture.channels_max = max_ch;
|
||||
dais[i].capture.rates = SNDRV_PCM_RATE_48000;
|
||||
dais[i].capture.formats = SNDRV_PCM_FMTBIT_S16_LE;
|
||||
}
|
||||
|
|
|
@ -814,7 +814,8 @@ static int do_bank_switch(struct sdw_stream_runtime *stream)
|
|||
goto error;
|
||||
}
|
||||
|
||||
mutex_unlock(&bus->msg_lock);
|
||||
if (bus->multi_link)
|
||||
mutex_unlock(&bus->msg_lock);
|
||||
}
|
||||
|
||||
return ret;
|
||||
|
@ -1406,9 +1407,7 @@ struct sdw_dpn_prop *sdw_get_slave_dpn_prop(struct sdw_slave *slave,
|
|||
}
|
||||
|
||||
for (i = 0; i < num_ports; i++) {
|
||||
dpn_prop = &dpn_prop[i];
|
||||
|
||||
if (dpn_prop->num == port_num)
|
||||
if (dpn_prop[i].num == port_num)
|
||||
return &dpn_prop[i];
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue