diff options
Diffstat (limited to 'drivers/media/dvb/firesat/avc_api.c')
-rw-r--r-- | drivers/media/dvb/firesat/avc_api.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/drivers/media/dvb/firesat/avc_api.c b/drivers/media/dvb/firesat/avc_api.c index d70795623fb9..0ad6420e342f 100644 --- a/drivers/media/dvb/firesat/avc_api.c +++ b/drivers/media/dvb/firesat/avc_api.c | |||
@@ -251,7 +251,7 @@ int AVCTuner_DSD(struct firesat *firesat, struct dvb_frontend_parameters *params | |||
251 | 251 | ||
252 | // printk(KERN_INFO "%s\n", __func__); | 252 | // printk(KERN_INFO "%s\n", __func__); |
253 | 253 | ||
254 | if(firesat->type == FireSAT_DVB_S) | 254 | if (firesat->type == FireSAT_DVB_S || firesat->type == FireSAT_DVB_S2) |
255 | AVCTuner_tuneQPSK(firesat, params, &CmdFrm); | 255 | AVCTuner_tuneQPSK(firesat, params, &CmdFrm); |
256 | else { | 256 | else { |
257 | if(firesat->type == FireSAT_DVB_T) { | 257 | if(firesat->type == FireSAT_DVB_T) { |
@@ -654,21 +654,6 @@ int AVCIdentifySubunit(struct firesat *firesat, unsigned char *systemId, int *tr | |||
654 | } | 654 | } |
655 | if(systemId) | 655 | if(systemId) |
656 | *systemId = RspFrm.operand[7]; | 656 | *systemId = RspFrm.operand[7]; |
657 | if(transport) | ||
658 | *transport = RspFrm.operand[14] & 0x7; | ||
659 | switch(RspFrm.operand[14] & 0x7) { | ||
660 | case 1: | ||
661 | printk(KERN_INFO "%s: found DVB/S\n",__func__); | ||
662 | break; | ||
663 | case 2: | ||
664 | printk(KERN_INFO "%s: found DVB/C\n",__func__); | ||
665 | break; | ||
666 | case 3: | ||
667 | printk(KERN_INFO "%s: found DVB/T\n",__func__); | ||
668 | break; | ||
669 | default: | ||
670 | printk(KERN_INFO "%s: found unknown tuner id %u\n",__func__,RspFrm.operand[14] & 0x7); | ||
671 | } | ||
672 | if(has_ci) | 657 | if(has_ci) |
673 | *has_ci = (RspFrm.operand[14] >> 4) & 0x1; | 658 | *has_ci = (RspFrm.operand[14] >> 4) & 0x1; |
674 | return 0; | 659 | return 0; |