aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorTrent Piepho <xyzzy@speakeasy.org>2009-03-28 21:25:36 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:43:45 -0400
commit185cda966633fc18b9df09b6d84d5ec2db4a57ff (patch)
treefd45b69e55bab69dee3ef50fa899e47852033251 /drivers/media
parentf29816bc317704a33b15269b9e2201de3c9d6a79 (diff)
V4L/DVB (11269): cx88-blackbird: Stop setting buffer type in XXX_fmt_vid_cap
The ->vidioc_(s|g|try|enum)_fmt_vid_cap() methods are only called on VIDEO_CAPTURE buffers. Thus, there is no need to check or set the 'type' field since it must already be set to VIDEO_CAPTURE. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/cx88/cx88-blackbird.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 7f5b8bfd08ac..484df549345c 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -746,7 +746,6 @@ static int vidioc_enum_fmt_vid_cap (struct file *file, void *priv,
746 return -EINVAL; 746 return -EINVAL;
747 747
748 strlcpy(f->description, "MPEG", sizeof(f->description)); 748 strlcpy(f->description, "MPEG", sizeof(f->description));
749 f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
750 f->pixelformat = V4L2_PIX_FMT_MPEG; 749 f->pixelformat = V4L2_PIX_FMT_MPEG;
751 return 0; 750 return 0;
752} 751}
@@ -757,7 +756,6 @@ static int vidioc_g_fmt_vid_cap (struct file *file, void *priv,
757 struct cx8802_fh *fh = priv; 756 struct cx8802_fh *fh = priv;
758 struct cx8802_dev *dev = fh->dev; 757 struct cx8802_dev *dev = fh->dev;
759 758
760 f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
761 f->fmt.pix.pixelformat = V4L2_PIX_FMT_MPEG; 759 f->fmt.pix.pixelformat = V4L2_PIX_FMT_MPEG;
762 f->fmt.pix.bytesperline = 0; 760 f->fmt.pix.bytesperline = 0;
763 f->fmt.pix.sizeimage = dev->ts_packet_size * dev->ts_packet_count; /* 188 * 4 * 1024; */ 761 f->fmt.pix.sizeimage = dev->ts_packet_size * dev->ts_packet_count; /* 188 * 4 * 1024; */
@@ -776,7 +774,6 @@ static int vidioc_try_fmt_vid_cap (struct file *file, void *priv,
776 struct cx8802_fh *fh = priv; 774 struct cx8802_fh *fh = priv;
777 struct cx8802_dev *dev = fh->dev; 775 struct cx8802_dev *dev = fh->dev;
778 776
779 f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
780 f->fmt.pix.pixelformat = V4L2_PIX_FMT_MPEG; 777 f->fmt.pix.pixelformat = V4L2_PIX_FMT_MPEG;
781 f->fmt.pix.bytesperline = 0; 778 f->fmt.pix.bytesperline = 0;
782 f->fmt.pix.sizeimage = dev->ts_packet_size * dev->ts_packet_count; /* 188 * 4 * 1024; */; 779 f->fmt.pix.sizeimage = dev->ts_packet_size * dev->ts_packet_count; /* 188 * 4 * 1024; */;
@@ -793,7 +790,6 @@ static int vidioc_s_fmt_vid_cap (struct file *file, void *priv,
793 struct cx8802_dev *dev = fh->dev; 790 struct cx8802_dev *dev = fh->dev;
794 struct cx88_core *core = dev->core; 791 struct cx88_core *core = dev->core;
795 792
796 f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
797 f->fmt.pix.pixelformat = V4L2_PIX_FMT_MPEG; 793 f->fmt.pix.pixelformat = V4L2_PIX_FMT_MPEG;
798 f->fmt.pix.bytesperline = 0; 794 f->fmt.pix.bytesperline = 0;
799 f->fmt.pix.sizeimage = dev->ts_packet_size * dev->ts_packet_count; /* 188 * 4 * 1024; */; 795 f->fmt.pix.sizeimage = dev->ts_packet_size * dev->ts_packet_count; /* 188 * 4 * 1024; */;