diff options
| author | Linaro CI <ci_notify@linaro.org> | 2021-06-28 02:49:41 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2021-06-28 02:49:41 +0000 |
| commit | 5eb224a3abb608b798e0ea6bb99e8125ed9be026 (patch) | |
| tree | 3e50484f1e8fe88f8d3c84626d023fca7a300e7f | |
| parent | 899d40332037afb7dbf5d5a42dfb463d2f515b61 (diff) | |
| parent | 93b5d3c3c23fc5ba24468cace70267f621f9a482 (diff) | |
Merge remote-tracking branch 'sdm845-camss/tracking-qcomlt-sdm845-camss' into integration-linux-qcomlt
# Conflicts:
# drivers/media/platform/qcom/camss/camss-csiphy.c
| -rw-r--r-- | drivers/media/platform/qcom/camss/camss-csiphy.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c b/drivers/media/platform/qcom/camss/camss-csiphy.c index b3c3bf19e522..27137117d1fe 100644 --- a/drivers/media/platform/qcom/camss/camss-csiphy.c +++ b/drivers/media/platform/qcom/camss/camss-csiphy.c @@ -601,8 +601,10 @@ int msm_csiphy_subdev_init(struct camss *camss, r = platform_get_resource_byname(pdev, IORESOURCE_MEM, res->reg[1]); csiphy->base_clk_mux = devm_ioremap_resource(dev, r); - if (IS_ERR(csiphy->base_clk_mux)) + if (IS_ERR(csiphy->base_clk_mux)) { + dev_err(dev, "could not map memory\n"); return PTR_ERR(csiphy->base_clk_mux); + } } else { csiphy->base_clk_mux = NULL; } |