summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Verkuil <devnull@localhost>2006-01-03 22:46:24 +0000
committerHans Verkuil <devnull@localhost>2006-01-03 22:46:24 +0000
commit3bc98ce6ea05a056facc4c5254c7a5725eea1e6c (patch)
tree32e7c66cb21d9435907c4fb34dfeb599e80eaf44
parent586e42cda069a43ff4e62e9a70a47b27703ad22f (diff)
downloadmediapointer-dvb-s2-3bc98ce6ea05a056facc4c5254c7a5725eea1e6c.tar.gz
mediapointer-dvb-s2-3bc98ce6ea05a056facc4c5254c7a5725eea1e6c.tar.bz2
Fix signed/unsigned bug in brightness handling of cx25840
Fix signed/unsigned bug in brightness handling (set to 0 and 128 was returned). Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
-rw-r--r--linux/drivers/media/video/cx25840/cx25840-core.c2
-rw-r--r--v4l/ChangeLog8
2 files changed, 9 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx25840/cx25840-core.c b/linux/drivers/media/video/cx25840/cx25840-core.c
index 890511cac..feb06c993 100644
--- a/linux/drivers/media/video/cx25840/cx25840-core.c
+++ b/linux/drivers/media/video/cx25840/cx25840-core.c
@@ -468,7 +468,7 @@ static int get_v4lctrl(struct i2c_client *client, struct v4l2_control *ctrl)
ctrl->value = state->pvr150_workaround;
break;
case V4L2_CID_BRIGHTNESS:
- ctrl->value = cx25840_read(client, 0x414) + 128;
+ ctrl->value = (s8)cx25840_read(client, 0x414) + 128;
break;
case V4L2_CID_CONTRAST:
ctrl->value = cx25840_read(client, 0x415) >> 1;
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 3f9119e0d..d69d04381 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-03 22:45 hverkuil
+
+ * linux/drivers/media/video/cx25840/cx25840-core.c: (get_v4lctrl):
+ Fix signed/unsigned bug in brightness handling (set to 0 and 128 was
+ returned).
+
+ Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
+
2006-01-03 22:36 hverkuil
* linux/drivers/media/video/cx25840/cx25840-core.c: (get_v4lctrl):