interconnect fixes for 5.4

Two tiny fixes for the current release:
 
 - Fix memory allocation size in a driver.
 - Add missing mutex.
 
 Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJdrvWvAAoJEIDQzArG2BZjZNoP/iz3mT4zEyHD+I7f2fP2jopt
 7H3+H5j8jM/1NsXD5QSLcpK6dL2Q0W3i2xR2FuoAM14M3v1OJ+RczMJsmKKMdxzr
 3hlMopgc/yzrewdFYnlgqsaugjMiO7hKXFyLqi7q4C+c63XwzaaESCBAH89LSD3t
 fb0RCgCNzrWAsd0wjCtQ/BQ5hoaWQEfTaF3q74UTQoGNrIOaVp10Uyvb36D0SDA5
 6Ammf2wBehtK/ZyvqOCf7HU6utWsucKLVOXCyowN41Fe6nXqfFWzg7NmufXdQ17U
 vo7vej0u8Zj7dRc91cC0+1EtUoZX0pcVxoiqrlYDkfDK1HVtt9ZUgICCYxlqVBZx
 VZRdAa5vIucr1xWlTRbYjbSu7Mkdz0KbhqfIrQvTO065RQlNEyRU/VxQvuBuQuzQ
 V2Yft5vwdx6cVCt2UDXHTemR31M0FPwLAvvLRQ1YJZ96/NtnskEoO4WnoNvv2XNp
 iZ61fV4BmE68DlqTlJAPJLgVhNKBTDU4t6D/eALlg4ILuW6bW2K3QVH0k/HeQ7LC
 02gS5jg35d/cguGiO8imXz178m/0ASiCo99hgwt4CJd6cdz+Uvcu9xCEw4xcdA9C
 JE2RiuZuJjmpYrh8ERPXbKVF/OJMB3MZa9LrEwXH4mCI5H2DWQSCNPUfwxZzsULv
 s02O79LBpgaOfmFOGVCU
 =Nhvn
 -----END PGP SIGNATURE-----

Merge tag 'icc-5.4-rc5' of https://git.linaro.org/people/georgi.djakov/linux into char-misc-linus

Georgi writes:

interconnect fixes for 5.4

Two tiny fixes for the current release:

- Fix memory allocation size in a driver.
- Add missing mutex.

Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>

* tag 'icc-5.4-rc5' of https://git.linaro.org/people/georgi.djakov/linux:
  interconnect: Add locking in icc_set_tag()
  interconnect: qcom: Fix icc_onecell_data allocation
This commit is contained in:
Greg Kroah-Hartman 2019-11-02 18:11:40 +01:00
commit 5e0eb05d7f
3 changed files with 8 additions and 2 deletions
drivers/interconnect

View File

@ -405,8 +405,12 @@ void icc_set_tag(struct icc_path *path, u32 tag)
if (!path)
return;
mutex_lock(&icc_lock);
for (i = 0; i < path->num_nodes; i++)
path->reqs[i].tag = tag;
mutex_unlock(&icc_lock);
}
EXPORT_SYMBOL_GPL(icc_set_tag);

View File

@ -433,7 +433,8 @@ static int qnoc_probe(struct platform_device *pdev)
if (!qp)
return -ENOMEM;
data = devm_kcalloc(dev, num_nodes, sizeof(*node), GFP_KERNEL);
data = devm_kzalloc(dev, struct_size(data, nodes, num_nodes),
GFP_KERNEL);
if (!data)
return -ENOMEM;

View File

@ -790,7 +790,8 @@ static int qnoc_probe(struct platform_device *pdev)
if (!qp)
return -ENOMEM;
data = devm_kcalloc(&pdev->dev, num_nodes, sizeof(*node), GFP_KERNEL);
data = devm_kzalloc(&pdev->dev, struct_size(data, nodes, num_nodes),
GFP_KERNEL);
if (!data)
return -ENOMEM;