diff options
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-empress.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-empress.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c index 77b627eb6483..e9ec69efb4c9 100644 --- a/drivers/media/video/saa7134/saa7134-empress.c +++ b/drivers/media/video/saa7134/saa7134-empress.c | |||
@@ -55,7 +55,7 @@ static void ts_reset_encoder(struct saa7134_dev* dev) | |||
55 | 55 | ||
56 | saa_writeb(SAA7134_SPECIAL_MODE, 0x00); | 56 | saa_writeb(SAA7134_SPECIAL_MODE, 0x00); |
57 | msleep(10); | 57 | msleep(10); |
58 | saa_writeb(SAA7134_SPECIAL_MODE, 0x01); | 58 | saa_writeb(SAA7134_SPECIAL_MODE, 0x01); |
59 | msleep(100); | 59 | msleep(100); |
60 | dev->empress_started = 0; | 60 | dev->empress_started = 0; |
61 | } | 61 | } |
@@ -65,7 +65,7 @@ static int ts_init_encoder(struct saa7134_dev* dev) | |||
65 | ts_reset_encoder(dev); | 65 | ts_reset_encoder(dev); |
66 | saa7134_i2c_call_clients(dev, VIDIOC_S_MPEGCOMP, NULL); | 66 | saa7134_i2c_call_clients(dev, VIDIOC_S_MPEGCOMP, NULL); |
67 | dev->empress_started = 1; | 67 | dev->empress_started = 1; |
68 | return 0; | 68 | return 0; |
69 | } | 69 | } |
70 | 70 | ||
71 | /* ------------------------------------------------------------------ */ | 71 | /* ------------------------------------------------------------------ */ |
@@ -169,7 +169,7 @@ static int ts_do_ioctl(struct inode *inode, struct file *file, | |||
169 | struct v4l2_capability *cap = arg; | 169 | struct v4l2_capability *cap = arg; |
170 | 170 | ||
171 | memset(cap,0,sizeof(*cap)); | 171 | memset(cap,0,sizeof(*cap)); |
172 | strcpy(cap->driver, "saa7134"); | 172 | strcpy(cap->driver, "saa7134"); |
173 | strlcpy(cap->card, saa7134_boards[dev->board].name, | 173 | strlcpy(cap->card, saa7134_boards[dev->board].name, |
174 | sizeof(cap->card)); | 174 | sizeof(cap->card)); |
175 | sprintf(cap->bus_info,"PCI:%s",pci_name(dev->pci)); | 175 | sprintf(cap->bus_info,"PCI:%s",pci_name(dev->pci)); |