summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/bttv-driver.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/bttv-driver.c')
-rw-r--r--linux/drivers/media/video/bttv-driver.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c
index 423a13517..44e8c00cc 100644
--- a/linux/drivers/media/video/bttv-driver.c
+++ b/linux/drivers/media/video/bttv-driver.c
@@ -1,5 +1,5 @@
/*
- $Id: bttv-driver.c,v 1.14 2004/09/15 16:15:24 kraxel Exp $
+ $Id: bttv-driver.c,v 1.15 2004/09/20 11:39:43 kraxel Exp $
bttv - Bt848 frame grabber driver
@@ -1054,11 +1054,6 @@ 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);
@@ -1067,6 +1062,11 @@ static void init_bt848(struct bttv *btv)
btwrite(BT848_CONTROL_LDEC, BT848_O_CONTROL);
}
+ bt848_bright(btv, btv->bright);
+ bt848_hue(btv, btv->hue);
+ bt848_contrast(btv, btv->contrast);
+ bt848_sat(btv, btv->saturation);
+
/* interrupt */
init_irqreg(btv);
}
@@ -3859,10 +3859,12 @@ static int __devinit bttv_probe(struct pci_dev *dev,
/* register video4linux + input */
if (!bttv_tvcards[btv->c.type].no_video) {
bttv_register_video(btv);
+#if 0
bt848_bright(btv,32768);
bt848_contrast(btv,32768);
bt848_hue(btv,32768);
bt848_sat(btv,32768);
+#endif
audio_mux(btv,AUDIO_MUTE);
set_input(btv,0);
}