diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-08-30 15:23:16 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-08-30 15:23:16 -0300 |
| commit | 71f8f83c1e99eb2701eea8bdf0ceae8d7196a850 (patch) | |
| tree | abc29f7f29710e229a45dea41db0ed30fb04a320 | |
| parent | 5a3951622542a34a4fa37c02073e41b7a0e77cb9 (diff) | |
| download | mediapointer-dvb-s2-71f8f83c1e99eb2701eea8bdf0ceae8d7196a850.tar.gz mediapointer-dvb-s2-71f8f83c1e99eb2701eea8bdf0ceae8d7196a850.tar.bz2 | |
Last patch wrongly applied. Reverting it...
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/Kconfig | 10 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7115.c | 9 |
2 files changed, 8 insertions, 11 deletions
diff --git a/linux/drivers/media/dvb/ttpci/Kconfig b/linux/drivers/media/dvb/ttpci/Kconfig index c6324c8d0..9ce932e97 100644 --- a/linux/drivers/media/dvb/ttpci/Kconfig +++ b/linux/drivers/media/dvb/ttpci/Kconfig @@ -1,6 +1,6 @@ config DVB_AV7110 tristate "AV7110 cards" - depends on DVB_CORE && PCI && I2C && VIDEO_V4L2 + depends on DVB_CORE && PCI && I2C && VIDEO_V4L1 select FW_LOADER select VIDEO_SAA7146_VV select DVB_PLL @@ -60,7 +60,7 @@ config DVB_AV7110_OSD config DVB_BUDGET tristate "Budget cards" - depends on DVB_CORE && PCI && I2C && VIDEO_V4L2 + depends on DVB_CORE && PCI && I2C && VIDEO_V4L1 select VIDEO_SAA7146 select DVB_PLL select DVB_STV0299 if !DVB_FE_CUSTOMISE @@ -85,7 +85,7 @@ config DVB_BUDGET config DVB_BUDGET_CI tristate "Budget cards with onboard CI connector" - depends on DVB_CORE && PCI && I2C && VIDEO_V4L2 + depends on DVB_CORE && PCI && I2C && VIDEO_V4L1 select VIDEO_SAA7146 select DVB_PLL select DVB_STV0297 if !DVB_FE_CUSTOMISE @@ -107,7 +107,7 @@ config DVB_BUDGET_CI config DVB_BUDGET_AV tristate "Budget cards with analog video inputs" - depends on DVB_CORE && PCI && I2C && VIDEO_V4L2 + depends on DVB_CORE && PCI && I2C && VIDEO_V4L1 select VIDEO_SAA7146_VV select DVB_PLL select DVB_STV0299 if !DVB_FE_CUSTOMISE @@ -126,7 +126,7 @@ config DVB_BUDGET_AV config DVB_BUDGET_PATCH tristate "AV7110 cards with Budget Patch" - depends on DVB_CORE && DVB_BUDGET && VIDEO_V4L2 + depends on DVB_CORE && DVB_BUDGET && VIDEO_V4L1 select DVB_AV7110 select DVB_PLL select DVB_STV0299 if !DVB_FE_CUSTOMISE diff --git a/linux/drivers/media/video/saa7115.c b/linux/drivers/media/video/saa7115.c index 84258d44b..c1cf58652 100644 --- a/linux/drivers/media/video/saa7115.c +++ b/linux/drivers/media/video/saa7115.c @@ -1057,9 +1057,6 @@ 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); @@ -1083,14 +1080,14 @@ static int saa711x_set_size(struct i2c_client *client, int width, int height) return -EINVAL; if (height != Vsrc) return -EINVAL; - - return 0; } + 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 */ + saa711x_write(client, R_CC_B_HORIZ_OUTPUT_WINDOW_LENGTH, (u8) (width & 0xff)); saa711x_write(client, R_CD_B_HORIZ_OUTPUT_WINDOW_LENGTH_MSB, |