diff options
Diffstat (limited to 'linux/drivers/media/video/bttv-driver.c')
| -rw-r--r-- | linux/drivers/media/video/bttv-driver.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c index 57a54b0ba..7a030e60d 100644 --- a/linux/drivers/media/video/bttv-driver.c +++ b/linux/drivers/media/video/bttv-driver.c @@ -1,6 +1,6 @@ /* - $Id: bttv-driver.c,v 1.21 2004/10/11 14:53:12 kraxel Exp $ + $Id: bttv-driver.c,v 1.22 2004/10/12 07:33:22 kraxel Exp $ bttv - Bt848 frame grabber driver @@ -996,6 +996,7 @@ set_input(struct bttv *btv, unsigned int input) audio_mux(btv,(input == bttv_tvcards[btv->c.type].tuner ? AUDIO_TUNER : AUDIO_EXTERN)); set_tvnorm(btv,btv->tvnorm); + i2c_vidiocschan(btv); } static void init_irqreg(struct bttv *btv) @@ -1713,7 +1714,6 @@ int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg) return -EINVAL; down(&btv->lock); set_input(btv,*i); - i2c_vidiocschan(btv); up(&btv->lock); return 0; } @@ -3952,7 +3952,7 @@ static int bttv_suspend(struct pci_dev *pci_dev, u32 state) struct bttv_buffer_set idle; unsigned long flags; - printk("bttv%d: suspend %d\n", btv->c.nr, state); + dprintk("bttv%d: suspend %d\n", btv->c.nr, state); /* stop dma + irqs */ spin_lock_irqsave(&btv->s_lock,flags); @@ -3986,7 +3986,7 @@ static int bttv_resume(struct pci_dev *pci_dev) struct bttv *btv = pci_get_drvdata(pci_dev); unsigned long flags; - printk("bttv%d: resume\n", btv->c.nr); + dprintk("bttv%d: resume\n", btv->c.nr); /* restore pci state */ if (btv->state.disabled) { |