Skip to content

Commit

Permalink
V4L/DVB (10064): mt9m111: mt9m111_get_global_gain() - unsigned >= 0 i…
Browse files Browse the repository at this point in the history
…s always true

unsigned >= 0 is always true and fix formula

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
roel kluin authored and Mauro Carvalho Chehab committed Dec 30, 2008
1 parent d25cb64 commit 0f28b79
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions drivers/media/video/mt9m111.c
Original file line number Diff line number Diff line change
Expand Up @@ -634,18 +634,15 @@ static int mt9m111_set_flip(struct soc_camera_device *icd, int flip, int mask)

static int mt9m111_get_global_gain(struct soc_camera_device *icd)
{
unsigned int data, gain;
int data;

data = reg_read(GLOBAL_GAIN);
if (data >= 0)
gain = ((data & (1 << 10)) * 2)
| ((data & (1 << 9)) * 2)
| (data & 0x2f);
else
gain = data;

return gain;
return (data & 0x2f) * (1 << ((data >> 10) & 1)) *
(1 << ((data >> 9) & 1));
return data;
}

static int mt9m111_set_global_gain(struct soc_camera_device *icd, int gain)
{
u16 val;
Expand Down

0 comments on commit 0f28b79

Please sign in to comment.