Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...

[cascardo/linux.git] / drivers / media / i2c / s5k6aa.c

diff --git a/drivers/media/i2c/s5k6aa.c b/drivers/media/i2c/s5k6aa.c
index de803a1..d0ad6a2 100644 (file)
--- a/drivers/media/i2c/s5k6aa.c
+++ b/drivers/media/i2c/s5k6aa.c
@@ -875,7 +875,7 @@ static int s5k6aa_set_power(struct v4l2_subdev *sd, int on)
 
        mutex_lock(&s5k6aa->lock);
 
-       if (!on == s5k6aa->power) {
+       if (s5k6aa->power == !on) {
                if (on) {
                        ret = __s5k6aa_power_on(s5k6aa);
                        if (!ret)