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

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

diff --git a/kernel/drivers/media/i2c/s5k5baf.c b/kernel/drivers/media/i2c/s5k5baf.c
index 297ef04..774e0d0 100644 (file)
--- a/kernel/drivers/media/i2c/s5k5baf.c
+++ b/kernel/drivers/media/i2c/s5k5baf.c
@@ -491,7 +491,7 @@ static void s5k5baf_write_arr_seq(struct s5k5baf *state, u16 addr,
        v4l2_dbg(3, debug, c, "i2c_write_seq(count=%d): %*ph\n", count,
                 min(2 * count, 64), seq);
 
-       buf[0] = __constant_cpu_to_be16(REG_CMD_BUF);
+       buf[0] = cpu_to_be16(REG_CMD_BUF);
 
        while (count > 0) {
                int n = min_t(int, count, ARRAY_SIZE(buf) - 1);
@@ -1054,7 +1054,7 @@ static int s5k5baf_set_power(struct v4l2_subdev *sd, int on)
 
        mutex_lock(&state->lock);
 
-       if (!on != state->power)
+       if (state->power != !on)
                goto out;
 
        if (on) {