aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/common/saa7146_video.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/common/saa7146_video.c')
-rw-r--r--drivers/media/common/saa7146_video.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c
index e3d04a4cef4d..664280c78ff2 100644
--- a/drivers/media/common/saa7146_video.c
+++ b/drivers/media/common/saa7146_video.c
@@ -889,9 +889,9 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
889 889
890 DEB_EE(("VIDIOC_QUERYCAP\n")); 890 DEB_EE(("VIDIOC_QUERYCAP\n"));
891 891
892 strcpy(cap->driver, "saa7146 v4l2"); 892 strcpy((char *)cap->driver, "saa7146 v4l2");
893 strlcpy(cap->card, dev->ext->name, sizeof(cap->card)); 893 strlcpy((char *)cap->card, dev->ext->name, sizeof(cap->card));
894 sprintf(cap->bus_info,"PCI:%s", pci_name(dev->pci)); 894 sprintf((char *)cap->bus_info,"PCI:%s", pci_name(dev->pci));
895 cap->version = SAA7146_VERSION_CODE; 895 cap->version = SAA7146_VERSION_CODE;
896 cap->capabilities = 896 cap->capabilities =
897 V4L2_CAP_VIDEO_CAPTURE | 897 V4L2_CAP_VIDEO_CAPTURE |
@@ -968,7 +968,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
968 } 968 }
969 memset(f,0,sizeof(*f)); 969 memset(f,0,sizeof(*f));
970 f->index = index; 970 f->index = index;
971 strlcpy(f->description,formats[index].name,sizeof(f->description)); 971 strlcpy((char *)f->description,formats[index].name,sizeof(f->description));
972 f->pixelformat = formats[index].pixelformat; 972 f->pixelformat = formats[index].pixelformat;
973 break; 973 break;
974 } 974 }