aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/dvb/ttpci/av7110.c12
-rw-r--r--drivers/media/dvb/ttpci/av7110_av.c10
2 files changed, 11 insertions, 11 deletions
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index 87767af7207c..ab4f77d73edc 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -122,11 +122,11 @@ static void init_av7110_av(struct av7110 *av7110)
122 /* set internal volume control to maximum */ 122 /* set internal volume control to maximum */
123 av7110->adac_type = DVB_ADAC_TI; 123 av7110->adac_type = DVB_ADAC_TI;
124 ret = av7110_set_volume(av7110, av7110->mixer.volume_left, av7110->mixer.volume_right); 124 ret = av7110_set_volume(av7110, av7110->mixer.volume_left, av7110->mixer.volume_right);
125 if (ret<0) 125 if (ret < 0)
126 printk("dvb-ttpci:cannot set internal volume to maximum:%d\n",ret); 126 printk("dvb-ttpci:cannot set internal volume to maximum:%d\n",ret);
127 127
128 ret = av7710_set_video_mode(av7110, vidmode); 128 ret = av7710_set_video_mode(av7110, vidmode);
129 if (ret<0) 129 if (ret < 0)
130 printk("dvb-ttpci:cannot set video mode:%d\n",ret); 130 printk("dvb-ttpci:cannot set video mode:%d\n",ret);
131 131
132 /* handle different card types */ 132 /* handle different card types */
@@ -162,10 +162,10 @@ static void init_av7110_av(struct av7110 *av7110)
162 if (av7110->adac_type == DVB_ADAC_NONE || av7110->adac_type == DVB_ADAC_MSP) { 162 if (av7110->adac_type == DVB_ADAC_NONE || av7110->adac_type == DVB_ADAC_MSP) {
163 // switch DVB SCART on 163 // switch DVB SCART on
164 ret = av7110_fw_cmd(av7110, COMTYPE_AUDIODAC, MainSwitch, 1, 0); 164 ret = av7110_fw_cmd(av7110, COMTYPE_AUDIODAC, MainSwitch, 1, 0);
165 if (ret<0) 165 if (ret < 0)
166 printk("dvb-ttpci:cannot switch on SCART(Main):%d\n",ret); 166 printk("dvb-ttpci:cannot switch on SCART(Main):%d\n",ret);
167 ret = av7110_fw_cmd(av7110, COMTYPE_AUDIODAC, ADSwitch, 1, 1); 167 ret = av7110_fw_cmd(av7110, COMTYPE_AUDIODAC, ADSwitch, 1, 1);
168 if (ret<0) 168 if (ret < 0)
169 printk("dvb-ttpci:cannot switch on SCART(AD):%d\n",ret); 169 printk("dvb-ttpci:cannot switch on SCART(AD):%d\n",ret);
170 if (rgb_on && 170 if (rgb_on &&
171 (av7110->dev->pci->subsystem_vendor == 0x110a) && (av7110->dev->pci->subsystem_device == 0x0000)) { 171 (av7110->dev->pci->subsystem_vendor == 0x110a) && (av7110->dev->pci->subsystem_device == 0x0000)) {
@@ -175,10 +175,10 @@ static void init_av7110_av(struct av7110 *av7110)
175 } 175 }
176 176
177 ret = av7110_set_volume(av7110, av7110->mixer.volume_left, av7110->mixer.volume_right); 177 ret = av7110_set_volume(av7110, av7110->mixer.volume_left, av7110->mixer.volume_right);
178 if (ret<0) 178 if (ret < 0)
179 printk("dvb-ttpci:cannot set volume :%d\n",ret); 179 printk("dvb-ttpci:cannot set volume :%d\n",ret);
180 ret = av7110_setup_irc_config(av7110, 0); 180 ret = av7110_setup_irc_config(av7110, 0);
181 if (ret<0) 181 if (ret < 0)
182 printk("dvb-ttpci:cannot setup irc config :%d\n",ret); 182 printk("dvb-ttpci:cannot setup irc config :%d\n",ret);
183} 183}
184 184
diff --git a/drivers/media/dvb/ttpci/av7110_av.c b/drivers/media/dvb/ttpci/av7110_av.c
index bbfad6def474..0696a5a4f855 100644
--- a/drivers/media/dvb/ttpci/av7110_av.c
+++ b/drivers/media/dvb/ttpci/av7110_av.c
@@ -1126,7 +1126,7 @@ static int dvb_video_ioctl(struct inode *inode, struct file *file,
1126 //note: arg is ignored by firmware 1126 //note: arg is ignored by firmware
1127 if (av7110->playing & RP_VIDEO) 1127 if (av7110->playing & RP_VIDEO)
1128 ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, 1128 ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY,
1129 __Scan_I, 2, AV_PES, 0); 1129 __Scan_I, 2, AV_PES, 0);
1130 else 1130 else
1131 ret = vidcom(av7110, VIDEO_CMD_FFWD, arg); 1131 ret = vidcom(av7110, VIDEO_CMD_FFWD, arg);
1132 if (!ret) { 1132 if (!ret) {
@@ -1164,15 +1164,15 @@ static int dvb_video_ioctl(struct inode *inode, struct file *file,
1164 1164
1165 if (av7110->playing == RP_AV) { 1165 if (av7110->playing == RP_AV) {
1166 ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, 1166 ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY,
1167 __Play, 2, AV_PES, 0); 1167 __Play, 2, AV_PES, 0);
1168 if (ret) 1168 if (ret)
1169 break; 1169 break;
1170 if (av7110->trickmode == TRICK_FAST) 1170 if (av7110->trickmode == TRICK_FAST)
1171 ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, 1171 ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY,
1172 __Scan_I, 2, AV_PES, 0); 1172 __Scan_I, 2, AV_PES, 0);
1173 if (av7110->trickmode == TRICK_SLOW) { 1173 if (av7110->trickmode == TRICK_SLOW) {
1174 ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, 1174 ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY,
1175 __Slow, 2, 0, 0); 1175 __Slow, 2, 0, 0);
1176 if (!ret) 1176 if (!ret)
1177 ret = vidcom(av7110, VIDEO_CMD_SLOW, arg); 1177 ret = vidcom(av7110, VIDEO_CMD_SLOW, arg);
1178 } 1178 }
@@ -1303,7 +1303,7 @@ static int dvb_audio_ioctl(struct inode *inode, struct file *file,
1303 av7110_ipack_reset(&av7110->ipack[0]); 1303 av7110_ipack_reset(&av7110->ipack[0]);
1304 if (av7110->playing == RP_AV) 1304 if (av7110->playing == RP_AV)
1305 ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, 1305 ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY,
1306 __Play, 2, AV_PES, 0); 1306 __Play, 2, AV_PES, 0);
1307 break; 1307 break;
1308 case AUDIO_SET_ID: 1308 case AUDIO_SET_ID:
1309 1309