Merge branch msm-4.4-android-10-clang into 10

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / drivers / media / platform / msm / camera_v2 / common / cam_soc_api.c

diff --git a/drivers/media/platform/msm/camera_v2/common/cam_soc_api.c b/drivers/media/platform/msm/camera_v2/common/cam_soc_api.c
index a0c606c..30cb835 100644 (file)
--- a/drivers/media/platform/msm/camera_v2/common/cam_soc_api.c
+++ b/drivers/media/platform/msm/camera_v2/common/cam_soc_api.c
@@ -205,7 +205,7 @@ int msm_camera_get_clk_info(struct platform_device *pdev,
 {
        int rc = 0;
 
-       if (!pdev || !&pdev->dev || !clk_info || !clk_ptr || !num_clk)
+       if (!pdev || !clk_info || !clk_ptr || !num_clk)
                return -EINVAL;
 
        rc = msm_camera_get_clk_info_internal(&pdev->dev,
@@ -355,6 +355,14 @@ int msm_camera_clk_enable(struct device *dev,
        if (enable) {
                for (i = 0; i < num_clk; i++) {
                        CDBG("enable %s\n", clk_info[i].clk_name);
+#ifdef CONFIG_MACH_XIAOMI_MSM8998
+                       clk_ptr[i] = clk_get(dev, clk_info[i].clk_name);
+                       if (IS_ERR(clk_ptr[i])) {
+                               pr_err("%s get failed\n", clk_info[i].clk_name);
+                               rc = PTR_ERR(clk_ptr[i]);
+                               goto cam_clk_set_err;
+                       }
+#endif
                        if (clk_info[i].clk_rate > 0) {
                                clk_rate = clk_round_rate(clk_ptr[i],
                                        clk_info[i].clk_rate);
@@ -507,7 +515,7 @@ int msm_camera_put_clk_info(struct platform_device *pdev,
 {
        int rc = 0;
 
-       if (!pdev || !&pdev->dev || !clk_info || !clk_ptr)
+       if (!pdev || !clk_info || !clk_ptr)
                return -EINVAL;
 
        rc = msm_camera_put_clk_info_internal(&pdev->dev,