From 4ea0c0588d4d6181c4440e86964c1380bb0da694 Mon Sep 17 00:00:00 2001 From: Gerd Knorr Date: Mon, 1 Mar 2004 12:16:24 +0000 Subject: - reprogram picture settings after reset. --- linux/drivers/media/video/bttv-driver.c | 10 +++++----- linux/drivers/media/video/cx88/cx88-cards.c | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'linux/drivers/media') diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c index cd790a558..ffedaf051 100644 --- a/linux/drivers/media/video/bttv-driver.c +++ b/linux/drivers/media/video/bttv-driver.c @@ -1050,6 +1050,11 @@ static void init_bt848(struct bttv *btv) btwrite(whitecrush_upper, BT848_WC_UP); btwrite(whitecrush_lower, BT848_WC_DOWN); + bt848_bright(btv, btv->bright); + bt848_hue(btv, btv->hue); + bt848_contrast(btv, btv->contrast); + bt848_sat(btv, btv->saturation); + if (btv->opt_lumafilter) { btwrite(0, BT848_E_CONTROL); btwrite(0, BT848_O_CONTROL); @@ -3900,11 +3905,6 @@ static int bttv_resume(struct pci_dev *pci_dev) gpio_inout(0xffffff, btv->state.gpio_enable); gpio_write(btv->state.gpio_data); - bt848_bright(btv, btv->bright); - bt848_hue(btv, btv->hue); - bt848_contrast(btv, btv->contrast); - bt848_sat(btv, btv->saturation); - /* restart dma */ spin_lock_irqsave(&btv->s_lock,flags); btv->curr = btv->state.set; diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index 9def4f412..df990c859 100644 --- a/linux/drivers/media/video/cx88/cx88-cards.c +++ b/linux/drivers/media/video/cx88/cx88-cards.c @@ -404,11 +404,13 @@ void __devinit cx88_card_setup(struct cx8800_dev *dev) switch (dev->board) { case CX88_BOARD_HAUPPAUGE: + printk("cx88_card_setup: Hauppauge\n") if (0 == dev->i2c_rc) i2c_eeprom(&dev->i2c_client,eeprom,sizeof(eeprom)); hauppauge_eeprom(dev,eeprom+8); break; case CX88_BOARD_GDI: + printk("cx88_card_setup: GDI\n") if (0 == dev->i2c_rc) i2c_eeprom(&dev->i2c_client,eeprom,sizeof(eeprom)); gdi_eeprom(dev,eeprom); -- cgit v1.2.3