Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / ipu-v3 / ipu-csi.c

diff --git a/drivers/gpu/ipu-v3/ipu-csi.c b/drivers/gpu/ipu-v3/ipu-csi.c
index 3bdb7058fcca156fae647d7699487a9ed60d91ac..06631ac61b045ca35de0fd54b78095252096c9cd 100644 (file)
--- a/drivers/gpu/ipu-v3/ipu-csi.c
+++ b/drivers/gpu/ipu-v3/ipu-csi.c
@@ -202,7 +202,7 @@ static int ipu_csi_set_testgen_mclk(struct ipu_csi *csi, u32 pixel_clk,
                                        u32 ipu_clk)
 {
        u32 temp;
-       u32 div_ratio;
+       int div_ratio;
 
        div_ratio = (ipu_clk / pixel_clk) - 1;