github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-04 04:23:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

phy: for 4.12-rc

Browse Source 
*) Fix return value check in phy-qcom-qmp driver
  *) Fix memory allocation bug in phy-qcom-qmp driver
 
 Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJZMTghAAoJEA5ceFyATYLZyIkQAKclJk29M6ZchxQETkAc2RNe
 Shn0VO+bP3VIBFwixR6nDR9YsdDoHZMAuy+GLiWnJ+j35CHxm8xuex6/KWoSodIu
 Drp9kKGz4nrcrxwnzpMxjd22BKH0VFagTnNLiOcHIrIQtwAVH3b6rOYRjqYlVouG
 wTqOgRUW12y91PQWWJqYFvv5rpHeD/wnSPYpzoO/z34lBNAXhLO7VDLKgM1JR56G
 6moCKWy/ZyoVK2J9CDEhM8LnbXhh34HinJMlTeShtubfyLPiK+y2/ZFfmElbSvM7
 ffqABfNL4swxpbh4Az404rZtC5FhWbO9zoEgHxCy0AsWSx9U3hyZnrmWC65asblA
 9BYiPcdne6rjLCBxlh4EXEjHkRz1TcK9xadZMoex/m/6DSZ0btc8uzUr0aG4CObn
 5VNjgn2Cbji7h3nSdwE6Ug3hpZCxIK+yugPg2Z6QnctROVHkZAOhKsEHTIYOjdk/
 r+fhU2eW+oiSprjRbwC0GGmjIp+NBoa4Ix2PQFMyVQBP9/ycOqNUtn9yo4pYPpU6
 5+a914uCzhsEn0ULeiPkOcbvgwJHLVSKu1QP1rtWkcuNJV4LchG2Wl87+HHlwAjE
 2wwhdRZ64OIIhim0urvhr/zSDoGWd7qrFrNRXyM1xOzfuioQ7WE6k91BO0gWVjtq
 N3+X5lWy+yEuQzRm3haX
 =scaY
 -----END PGP SIGNATURE-----

Merge tag 'phy-for-4.12-rc-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-linus

Kishon writes:

phy: for 4.12-rc

 *) Fix return value check in phy-qcom-qmp driver
 *) Fix memory allocation bug in phy-qcom-qmp driver

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
This commit is contained in:
Greg Kroah-Hartman 2017-06-03 09:55:59 +09:00
commit 29532e7b67
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/phy/phy-qcom-qmp.c
View File

@ -844,7 +844,7 @@ static int qcom_qmp_phy_vreg_init(struct device *dev)
int num = qmp->cfg->num_vregs;
int i;
qmp->vregs = devm_kcalloc(dev, num, sizeof(qmp->vregs), GFP_KERNEL);
qmp->vregs = devm_kcalloc(dev, num, sizeof(*qmp->vregs), GFP_KERNEL);
if (!qmp->vregs)
return -ENOMEM;
@ -983,16 +983,16 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id)
* Resources are indexed as: tx -> 0; rx -> 1; pcs -> 2.
*/
qphy->tx = of_iomap(np, 0);
if (IS_ERR(qphy->tx))
return PTR_ERR(qphy->tx);
if (!qphy->tx)
return -ENOMEM;
qphy->rx = of_iomap(np, 1);
if (IS_ERR(qphy->rx))
return PTR_ERR(qphy->rx);
if (!qphy->rx)
return -ENOMEM;
qphy->pcs = of_iomap(np, 2);
if (IS_ERR(qphy->pcs))
return PTR_ERR(qphy->pcs);
if (!qphy->pcs)
return -ENOMEM;
/*
* Get PHY's Pipe clock, if any. USB3 and PCIe are PIPE3