summaryrefslogtreecommitdiff
path: root/drivers/media/pci/cx25821/cx25821-core.c
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-04-14 15:02:19 (GMT)
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-04-16 21:12:34 (GMT)
commitea3f7ac6e931f9aaa45e0a8445406f14e2a62011 (patch)
tree7d1bdfbe00e326943c3c69640c5cc10c1b917f34 /drivers/media/pci/cx25821/cx25821-core.c
parent7087d31b0c9dddbca71b8e33d3f0a3b719afa397 (diff)
downloadlinux-ea3f7ac6e931f9aaa45e0a8445406f14e2a62011.tar.xz
[media] cx25821: replace custom ioctls with write()
Ideally this should be implemented with vb2, but it'll do for now. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/pci/cx25821/cx25821-core.c')
-rw-r--r--drivers/media/pci/cx25821/cx25821-core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/pci/cx25821/cx25821-core.c b/drivers/media/pci/cx25821/cx25821-core.c
index 230bd86..35bea79 100644
--- a/drivers/media/pci/cx25821/cx25821-core.c
+++ b/drivers/media/pci/cx25821/cx25821-core.c
@@ -775,8 +775,8 @@ void cx25821_set_pixel_format(struct cx25821_dev *dev, int channel_select,
if (channel_select <= 7 && channel_select >= 0) {
cx_write(dev->channels[channel_select].sram_channels->pix_frmt,
format);
- dev->channels[channel_select].pixel_formats = format;
}
+ dev->channels[channel_select].pixel_formats = format;
}
static void cx25821_set_vip_mode(struct cx25821_dev *dev,
@@ -820,6 +820,7 @@ static void cx25821_initialize(struct cx25821_dev *dev)
/* Probably only affect Downstream */
for (i = VID_UPSTREAM_SRAM_CHANNEL_I;
i <= VID_UPSTREAM_SRAM_CHANNEL_J; i++) {
+ dev->channels[i].pixel_formats = PIXEL_FRMT_422;
cx25821_set_vip_mode(dev, dev->channels[i].sram_channels);
}