diff options
Diffstat (limited to 'linux/drivers/media/video/bttv-driver.c')
| -rw-r--r-- | linux/drivers/media/video/bttv-driver.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c index e3d2d29fc..e0865757a 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.75 2005/12/04 21:06:50 mkrufky Exp $ + $Id: bttv-driver.c,v 1.76 2005/12/07 11:18:39 mchehab Exp $ bttv - Bt848 frame grabber driver @@ -35,7 +35,6 @@ #include <linux/sched.h> #include <linux/interrupt.h> #include <linux/kdev_t.h> -#include "bttvp.h" #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) #include <linux/dma-mapping.h> #endif @@ -43,6 +42,7 @@ #include <asm/io.h> #include <asm/byteorder.h> +#include "bttvp.h" #include "rds.h" @@ -779,7 +779,7 @@ static void set_pll(struct bttv *btv) /* no PLL needed */ if (btv->pll.pll_current == 0) return; - verbose_printk(KERN_INFO "bttv%d: PLL can sleep, using XTAL (%d).\n", + bttv_printk(KERN_INFO "bttv%d: PLL can sleep, using XTAL (%d).\n", btv->c.nr,btv->pll.pll_ifreq); btwrite(0x00,BT848_TGCTRL); btwrite(0x00,BT848_PLL_XCI); @@ -787,13 +787,13 @@ static void set_pll(struct bttv *btv) return; } - verbose_printk(KERN_INFO "bttv%d: PLL: %d => %d ",btv->c.nr, + bttv_printk(KERN_INFO "bttv%d: PLL: %d => %d ",btv->c.nr, btv->pll.pll_ifreq, btv->pll.pll_ofreq); set_pll_freq(btv, btv->pll.pll_ifreq, btv->pll.pll_ofreq); for (i=0; i<10; i++) { /* Let other people run while the PLL stabilizes */ - verbose_printk("."); + bttv_printk("."); msleep(10); if (btread(BT848_DSTATUS) & BT848_DSTATUS_PLOCK) { @@ -801,12 +801,12 @@ static void set_pll(struct bttv *btv) } else { btwrite(0x08,BT848_TGCTRL); btv->pll.pll_current = btv->pll.pll_ofreq; - verbose_printk(" ok\n"); + bttv_printk(" ok\n"); return; } } btv->pll.pll_current = -1; - verbose_printk("failed\n"); + bttv_printk("failed\n"); return; } @@ -1990,7 +1990,6 @@ static int setup_window(struct bttv_fh *fh, struct bttv *btv, } down(&fh->cap.lock); - if (fh->ov.clips) kfree(fh->ov.clips); fh->ov.clips = clips; fh->ov.nclips = n; @@ -2785,7 +2784,6 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file, fh->ov.w.height = fb->fmt.height; btv->init.ov.w.width = fb->fmt.width; btv->init.ov.w.height = fb->fmt.height; - if (fh->ov.clips) kfree(fh->ov.clips); fh->ov.clips = NULL; fh->ov.nclips = 0; |