diff options
| author |  Ingo Molnar <mingo@kernel.org>
| 2018-03-31 07:30:17 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org>
| 2018-03-31 07:30:17 +0200 |
| commit | 169310f71fc820fe153ec04c6a111e444a68d6d5 (patch) | |
| tree | a586d0f08548159ceb8527ff59f8414579f70c1f /drivers/clk/qcom/apcs-msm8916.c | |
| parent | lockdep: Make the lock debug output more useful (diff) | |
| parent | Merge tag 'for-4.16/dm-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| download | linux-169310f71fc820fe153ec04c6a111e444a68d6d5.tar.gz linux-169310f71fc820fe153ec04c6a111e444a68d6d5.tar.bz2 linux-169310f71fc820fe153ec04c6a111e444a68d6d5.zip | |
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/clk/qcom/apcs-msm8916.c')
| -rw-r--r-- | drivers/clk/qcom/apcs-msm8916.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/clk/qcom/apcs-msm8916.c b/drivers/clk/qcom/apcs-msm8916.c index 246957f1a413..b1cc8dbcd327 100644 --- a/drivers/clk/qcom/apcs-msm8916.c +++ b/drivers/clk/qcom/apcs-msm8916.c @@ -49,11 +49,10 @@ static int qcom_apcs_msm8916_clk_probe(struct platform_device *pdev) struct clk_regmap_mux_div *a53cc; struct regmap *regmap; struct clk_init_data init = { }; - int ret; + int ret = -ENODEV; regmap = dev_get_regmap(parent, NULL); - if (IS_ERR(regmap)) { - ret = PTR_ERR(regmap); + if (!regmap) { dev_err(dev, "failed to get regmap: %d\n", ret); return ret; } |