patch-2.1.122 linux/drivers/char/bttv.c

Next file: linux/drivers/net/3c523.c
Previous file: linux/drivers/char/apm_bios.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.121/linux/drivers/char/bttv.c linux/drivers/char/bttv.c
@@ -684,7 +684,7 @@
        BT848_COLOR_FMT_YCrCb422,
        BT848_COLOR_FMT_YCrCb411,
 };
-#define PALETTEFMT_MAX 11
+#define PALETTEFMT_MAX 15
 
 static int make_rawrisctab(struct bttv *btv, unsigned int *ro,
                             unsigned int *re, unsigned int *vbuf)
@@ -2924,7 +2924,7 @@
         printk("memory: 0x%08x.\n", btv->bt848_adr);
         
         btv->pll.pll_ifreq=0;
-        btv->pll.pll_ifreq=0;
+        btv->pll.pll_ofreq=0;
         btv->pll.pll_crystal=0;
         if(pll[btv->nr])
                 if (!(btv->id==848 && btv->revision==0x11))

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov