diff options
Diffstat (limited to 'drivers/media/pci/cx88')
-rw-r--r-- | drivers/media/pci/cx88/cx88-blackbird.c | 6 | ||||
-rw-r--r-- | drivers/media/pci/cx88/cx88-dvb.c | 2 | ||||
-rw-r--r-- | drivers/media/pci/cx88/cx88-mpeg.c | 2 | ||||
-rw-r--r-- | drivers/media/pci/cx88/cx88-tvaudio.c | 4 | ||||
-rw-r--r-- | drivers/media/pci/cx88/cx88-video.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/pci/cx88/cx88-blackbird.c b/drivers/media/pci/cx88/cx88-blackbird.c index def363fb71c0..62184eb919e5 100644 --- a/drivers/media/pci/cx88/cx88-blackbird.c +++ b/drivers/media/pci/cx88/cx88-blackbird.c | |||
@@ -721,7 +721,7 @@ static int vidioc_g_fmt_vid_cap (struct file *file, void *priv, | |||
721 | 721 | ||
722 | f->fmt.pix.pixelformat = V4L2_PIX_FMT_MPEG; | 722 | f->fmt.pix.pixelformat = V4L2_PIX_FMT_MPEG; |
723 | f->fmt.pix.bytesperline = 0; | 723 | f->fmt.pix.bytesperline = 0; |
724 | f->fmt.pix.sizeimage = 188 * 4 * mpegbufs; /* 188 * 4 * 1024; */; | 724 | f->fmt.pix.sizeimage = 188 * 4 * mpegbufs; /* 188 * 4 * 1024; */ |
725 | f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M; | 725 | f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M; |
726 | f->fmt.pix.width = dev->width; | 726 | f->fmt.pix.width = dev->width; |
727 | f->fmt.pix.height = dev->height; | 727 | f->fmt.pix.height = dev->height; |
@@ -739,7 +739,7 @@ static int vidioc_try_fmt_vid_cap (struct file *file, void *priv, | |||
739 | 739 | ||
740 | f->fmt.pix.pixelformat = V4L2_PIX_FMT_MPEG; | 740 | f->fmt.pix.pixelformat = V4L2_PIX_FMT_MPEG; |
741 | f->fmt.pix.bytesperline = 0; | 741 | f->fmt.pix.bytesperline = 0; |
742 | f->fmt.pix.sizeimage = 188 * 4 * mpegbufs; /* 188 * 4 * 1024; */; | 742 | f->fmt.pix.sizeimage = 188 * 4 * mpegbufs; /* 188 * 4 * 1024; */ |
743 | f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M; | 743 | f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M; |
744 | dprintk(1, "VIDIOC_TRY_FMT: w: %d, h: %d, f: %d\n", | 744 | dprintk(1, "VIDIOC_TRY_FMT: w: %d, h: %d, f: %d\n", |
745 | dev->width, dev->height, fh->mpegq.field ); | 745 | dev->width, dev->height, fh->mpegq.field ); |
@@ -755,7 +755,7 @@ static int vidioc_s_fmt_vid_cap (struct file *file, void *priv, | |||
755 | 755 | ||
756 | f->fmt.pix.pixelformat = V4L2_PIX_FMT_MPEG; | 756 | f->fmt.pix.pixelformat = V4L2_PIX_FMT_MPEG; |
757 | f->fmt.pix.bytesperline = 0; | 757 | f->fmt.pix.bytesperline = 0; |
758 | f->fmt.pix.sizeimage = 188 * 4 * mpegbufs; /* 188 * 4 * 1024; */; | 758 | f->fmt.pix.sizeimage = 188 * 4 * mpegbufs; /* 188 * 4 * 1024; */ |
759 | f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M; | 759 | f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M; |
760 | dev->width = f->fmt.pix.width; | 760 | dev->width = f->fmt.pix.width; |
761 | dev->height = f->fmt.pix.height; | 761 | dev->height = f->fmt.pix.height; |
diff --git a/drivers/media/pci/cx88/cx88-dvb.c b/drivers/media/pci/cx88/cx88-dvb.c index d803bba09525..666f83b2f3c0 100644 --- a/drivers/media/pci/cx88/cx88-dvb.c +++ b/drivers/media/pci/cx88/cx88-dvb.c | |||
@@ -896,7 +896,7 @@ static int samsung_smt_7020_set_voltage(struct dvb_frontend *fe, | |||
896 | break; | 896 | break; |
897 | default: | 897 | default: |
898 | return -EINVAL; | 898 | return -EINVAL; |
899 | }; | 899 | } |
900 | 900 | ||
901 | return (i2c_transfer(&dev->core->i2c_adap, &msg, 1) == 1) ? 0 : -EIO; | 901 | return (i2c_transfer(&dev->core->i2c_adap, &msg, 1) == 1) ? 0 : -EIO; |
902 | } | 902 | } |
diff --git a/drivers/media/pci/cx88/cx88-mpeg.c b/drivers/media/pci/cx88/cx88-mpeg.c index c04fb618e10b..d154bc197356 100644 --- a/drivers/media/pci/cx88/cx88-mpeg.c +++ b/drivers/media/pci/cx88/cx88-mpeg.c | |||
@@ -450,7 +450,7 @@ static irqreturn_t cx8802_irq(int irq, void *dev_id) | |||
450 | cx88_core_irq(core,status); | 450 | cx88_core_irq(core,status); |
451 | if (status & PCI_INT_TSINT) | 451 | if (status & PCI_INT_TSINT) |
452 | cx8802_mpeg_irq(dev); | 452 | cx8802_mpeg_irq(dev); |
453 | }; | 453 | } |
454 | if (MAX_IRQ_LOOP == loop) { | 454 | if (MAX_IRQ_LOOP == loop) { |
455 | dprintk( 0, "clearing mask\n" ); | 455 | dprintk( 0, "clearing mask\n" ); |
456 | printk(KERN_WARNING "%s/0: irq loop -- clearing mask\n", | 456 | printk(KERN_WARNING "%s/0: irq loop -- clearing mask\n", |
diff --git a/drivers/media/pci/cx88/cx88-tvaudio.c b/drivers/media/pci/cx88/cx88-tvaudio.c index 770ec05b5e9b..424fd97495dc 100644 --- a/drivers/media/pci/cx88/cx88-tvaudio.c +++ b/drivers/media/pci/cx88/cx88-tvaudio.c | |||
@@ -373,7 +373,7 @@ static void set_audio_standard_NICAM(struct cx88_core *core, u32 mode) | |||
373 | set_audio_registers(core, nicam_bgdki_common); | 373 | set_audio_registers(core, nicam_bgdki_common); |
374 | set_audio_registers(core, nicam_default); | 374 | set_audio_registers(core, nicam_default); |
375 | break; | 375 | break; |
376 | }; | 376 | } |
377 | 377 | ||
378 | mode |= EN_DMTRX_LR | EN_DMTRX_BYPASS; | 378 | mode |= EN_DMTRX_LR | EN_DMTRX_BYPASS; |
379 | set_audio_finish(core, mode); | 379 | set_audio_finish(core, mode); |
@@ -639,7 +639,7 @@ static void set_audio_standard_A2(struct cx88_core *core, u32 mode) | |||
639 | dprintk("%s Warning: wrong value\n", __func__); | 639 | dprintk("%s Warning: wrong value\n", __func__); |
640 | return; | 640 | return; |
641 | break; | 641 | break; |
642 | }; | 642 | } |
643 | 643 | ||
644 | mode |= EN_FMRADIO_EN_RDS | EN_DMTRX_SUMDIFF; | 644 | mode |= EN_FMRADIO_EN_RDS | EN_DMTRX_SUMDIFF; |
645 | set_audio_finish(core, mode); | 645 | set_audio_finish(core, mode); |
diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c index a146d50d7795..05171457bf28 100644 --- a/drivers/media/pci/cx88/cx88-video.c +++ b/drivers/media/pci/cx88/cx88-video.c | |||
@@ -1535,7 +1535,7 @@ static irqreturn_t cx8800_irq(int irq, void *dev_id) | |||
1535 | cx88_core_irq(core,status); | 1535 | cx88_core_irq(core,status); |
1536 | if (status & PCI_INT_VIDINT) | 1536 | if (status & PCI_INT_VIDINT) |
1537 | cx8800_vid_irq(dev); | 1537 | cx8800_vid_irq(dev); |
1538 | }; | 1538 | } |
1539 | if (10 == loop) { | 1539 | if (10 == loop) { |
1540 | printk(KERN_WARNING "%s/0: irq loop -- clearing mask\n", | 1540 | printk(KERN_WARNING "%s/0: irq loop -- clearing mask\n", |
1541 | core->name); | 1541 | core->name); |