diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-19 05:29:23 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-19 05:29:23 -0700 |
| commit | 0ac70872477bf4d0e49edde81e5544b5cc66576d (patch) | |
| tree | f6732f3f0b9fc71c526cebf87f589fd058bcca21 | |
| parent | 530f2999e876c300356b5cb0a3026ccc5f76f44b (diff) | |
| parent | e449829951862ccc628e3b7ed62bd0df51483e1b (diff) | |
Merge "usb: phy: qusb: reset size to zero before getting next property size"
| -rw-r--r-- | drivers/usb/phy/phy-msm-qusb-v2.c | 3 | ||||
| -rw-r--r-- | drivers/usb/phy/phy-msm-qusb.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/usb/phy/phy-msm-qusb-v2.c b/drivers/usb/phy/phy-msm-qusb-v2.c index f8121eb4f63a..23a4ac11af36 100644 --- a/drivers/usb/phy/phy-msm-qusb-v2.c +++ b/drivers/usb/phy/phy-msm-qusb-v2.c @@ -808,6 +808,7 @@ static int qusb_phy_probe(struct platform_device *pdev) } } + size = 0; of_get_property(dev->of_node, "qcom,phy-pll-reset-seq", &size); if (size) { qphy->phy_pll_reset_seq = devm_kzalloc(dev, @@ -830,6 +831,7 @@ static int qusb_phy_probe(struct platform_device *pdev) } } + size = 0; of_get_property(dev->of_node, "qcom,emu-dcm-reset-seq", &size); if (size) { qphy->emu_dcm_reset_seq = devm_kzalloc(dev, @@ -852,6 +854,7 @@ static int qusb_phy_probe(struct platform_device *pdev) } } + size = 0; of_get_property(dev->of_node, "qcom,qusb-phy-init-seq", &size); if (size) { qphy->qusb_phy_init_seq = devm_kzalloc(dev, diff --git a/drivers/usb/phy/phy-msm-qusb.c b/drivers/usb/phy/phy-msm-qusb.c index 5ec08098d197..af7ec03314f5 100644 --- a/drivers/usb/phy/phy-msm-qusb.c +++ b/drivers/usb/phy/phy-msm-qusb.c @@ -886,6 +886,7 @@ static int qusb_phy_probe(struct platform_device *pdev) } } + size = 0; of_get_property(dev->of_node, "qcom,phy-pll-reset-seq", &size); if (size) { qphy->phy_pll_reset_seq = devm_kzalloc(dev, @@ -907,6 +908,7 @@ static int qusb_phy_probe(struct platform_device *pdev) } } + size = 0; of_get_property(dev->of_node, "qcom,emu-dcm-reset-seq", &size); if (size) { qphy->emu_dcm_reset_seq = devm_kzalloc(dev, @@ -928,6 +930,7 @@ static int qusb_phy_probe(struct platform_device *pdev) } } + size = 0; of_get_property(dev->of_node, "qcom,qusb-phy-init-seq", &size); if (size) { qphy->qusb_phy_init_seq = devm_kzalloc(dev, |