Commit fb095146 authored by Hans Verkuil's avatar Hans Verkuil Committed by Greg Kroah-Hartman

s3c-camif: fix compiler warnings

commit 7e0d4e92 upstream.

Fix these compiler warnings that appeared after switching to gcc-5.1.0:

drivers/media/platform/s3c-camif/camif-capture.c: In function 'sensor_set_power':
drivers/media/platform/s3c-camif/camif-capture.c:118:10: warning: logical not is only applied to the left hand side of comparison [-Wlogical-not-parentheses]
  if (!on == camif->sensor.power_count)
          ^
drivers/media/platform/s3c-camif/camif-capture.c: In function 'sensor_set_streaming':
drivers/media/platform/s3c-camif/camif-capture.c:134:10: warning: logical not is only applied to the left hand side of comparison [-Wlogical-not-parentheses]
  if (!on == camif->sensor.stream_count)
          ^
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Cc: Kamil Debski <k.debski@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 696ebb3a
...@@ -115,7 +115,7 @@ static int sensor_set_power(struct camif_dev *camif, int on) ...@@ -115,7 +115,7 @@ static int sensor_set_power(struct camif_dev *camif, int on)
struct cam_sensor *sensor = &camif->sensor; struct cam_sensor *sensor = &camif->sensor;
int err = 0; int err = 0;
if (!on == camif->sensor.power_count) if (camif->sensor.power_count == !on)
err = v4l2_subdev_call(sensor->sd, core, s_power, on); err = v4l2_subdev_call(sensor->sd, core, s_power, on);
if (!err) if (!err)
sensor->power_count += on ? 1 : -1; sensor->power_count += on ? 1 : -1;
...@@ -131,7 +131,7 @@ static int sensor_set_streaming(struct camif_dev *camif, int on) ...@@ -131,7 +131,7 @@ static int sensor_set_streaming(struct camif_dev *camif, int on)
struct cam_sensor *sensor = &camif->sensor; struct cam_sensor *sensor = &camif->sensor;
int err = 0; int err = 0;
if (!on == camif->sensor.stream_count) if (camif->sensor.stream_count == !on)
err = v4l2_subdev_call(sensor->sd, video, s_stream, on); err = v4l2_subdev_call(sensor->sd, video, s_stream, on);
if (!err) if (!err)
sensor->stream_count += on ? 1 : -1; sensor->stream_count += on ? 1 : -1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment