diff options
| author | Skylar Chang <chiaweic@codeaurora.org> | 2016-06-22 16:28:29 -0700 |
|---|---|---|
| committer | Kyle Yan <kyan@codeaurora.org> | 2016-07-11 18:56:19 -0700 |
| commit | 17c0378ccd5de5c8e9277f2a295694208b037a65 (patch) | |
| tree | f4c7cd626936ff97daff244a07e78fe6f16ca040 /drivers/platform | |
| parent | 7b99fa6203541a667d7d6c3a21bc6b65101679e5 (diff) | |
msm: ipa3: fix the double ipa3_pre_init issue
With smmu enabling, ipa3_pre_init is actually
probed twice and causing the crash, the fix
is to do only once.
Change-Id: I20bd718c8cb70029c4dd46c52dbece326b90ef80
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/msm/ipa/ipa_v3/ipa.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa.c b/drivers/platform/msm/ipa/ipa_v3/ipa.c index 747ae3d82b68..3f4fc3fe8793 100644 --- a/drivers/platform/msm/ipa/ipa_v3/ipa.c +++ b/drivers/platform/msm/ipa/ipa_v3/ipa.c @@ -5059,16 +5059,16 @@ int ipa3_plat_drv_probe(struct platform_device *pdev_p, return -EOPNOTSUPP; } } - } - if (!ipa3_bus_scale_table) - ipa3_bus_scale_table = msm_bus_cl_get_pdata(pdev_p); + if (!ipa3_bus_scale_table) + ipa3_bus_scale_table = msm_bus_cl_get_pdata(pdev_p); - /* Proceed to real initialization */ - result = ipa3_pre_init(&ipa3_res, dev); - if (result) { - IPAERR("ipa3_init failed\n"); - return result; + /* Proceed to real initialization */ + result = ipa3_pre_init(&ipa3_res, dev); + if (result) { + IPAERR("ipa3_init failed\n"); + return result; + } } return result; |