summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-08-30 15:15:59 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-08-30 15:15:59 -0300
commit5a3951622542a34a4fa37c02073e41b7a0e77cb9 (patch)
treebd3232522a9f60d2828987af6bf8dc46f95695dd /linux/drivers/media/video
parentbbed4f2678799ffef871fa7f2f2f631c3474d825 (diff)
downloadmediapointer-dvb-s2-5a3951622542a34a4fa37c02073e41b7a0e77cb9.tar.gz
mediapointer-dvb-s2-5a3951622542a34a4fa37c02073e41b7a0e77cb9.tar.bz2
Fix encoder norm
From: Mauro Carvalho Chehab <mchehab@infradead.org> Encoder API is still V4L1. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r--linux/drivers/media/video/saa7115.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/linux/drivers/media/video/saa7115.c b/linux/drivers/media/video/saa7115.c
index c1cf58652..84258d44b 100644
--- a/linux/drivers/media/video/saa7115.c
+++ b/linux/drivers/media/video/saa7115.c
@@ -1057,6 +1057,9 @@ static int saa711x_get_v4lfmt(struct i2c_client *client, struct v4l2_format *fmt
return 0;
}
+/*
+ * Sets Task B FIR filters to scale - works only on saa7114 or upper
+ */
static int saa711x_set_size(struct i2c_client *client, int width, int height)
{
struct saa711x_state *state = i2c_get_clientdata(client);
@@ -1080,14 +1083,14 @@ static int saa711x_set_size(struct i2c_client *client, int width, int height)
return -EINVAL;
if (height != Vsrc)
return -EINVAL;
- }
- if (!saa711x_has_reg(state->ident,R_CC_B_HORIZ_OUTPUT_WINDOW_LENGTH))
+
return 0;
+ }
/* probably have a valid size, let's set it */
/* Set output width/height */
- /* width */
+ /* width */
saa711x_write(client, R_CC_B_HORIZ_OUTPUT_WINDOW_LENGTH,
(u8) (width & 0xff));
saa711x_write(client, R_CD_B_HORIZ_OUTPUT_WINDOW_LENGTH_MSB,