These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / media / i2c / ov9650.c

diff --git a/kernel/drivers/media/i2c/ov9650.c b/kernel/drivers/media/i2c/ov9650.c
index 2bc4733..1ee6a55 100644 (file)
--- a/kernel/drivers/media/i2c/ov9650.c
+++ b/kernel/drivers/media/i2c/ov9650.c
@@ -1133,7 +1133,7 @@ static int __ov965x_set_frame_interval(struct ov965x *ov965x,
                if (mbus_fmt->width != iv->size.width ||
                    mbus_fmt->height != iv->size.height)
                        continue;
-               err = abs64((u64)(iv->interval.numerator * 10000) /
+               err = abs((u64)(iv->interval.numerator * 10000) /
                            iv->interval.denominator - req_int);
                if (err < min_err) {
                        fiv = iv;
@@ -1436,7 +1436,7 @@ static int ov965x_detect_sensor(struct v4l2_subdev *sd)
        int ret;
 
        mutex_lock(&ov965x->lock);
-        __ov965x_set_power(ov965x, 1);
+       __ov965x_set_power(ov965x, 1);
        usleep_range(25000, 26000);
 
        /* Check sensor revision */