- When converting satellite receiver parameters from S2API to legacy,
  identify a satellite receiver by its 'delivery_system' instead of
  'modulation', which may overlap between different delivery systems.

Signed-off-by: Andreas Oberritter <[email protected]>
---
 drivers/media/dvb/dvb-core/dvb_frontend.c |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c 
b/drivers/media/dvb/dvb-core/dvb_frontend.c
index d02c32e..d218fe2 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -1132,16 +1132,13 @@ static void dtv_property_adv_params_sync(struct 
dvb_frontend *fe)
        p->frequency = c->frequency;
        p->inversion = c->inversion;
 
-       switch(c->modulation) {
-       case PSK_8:
-       case APSK_16:
-       case APSK_32:
-       case QPSK:
+       if (c->delivery_system == SYS_DSS ||
+           c->delivery_system == SYS_DVBS ||
+           c->delivery_system == SYS_DVBS2 ||
+           c->delivery_system == SYS_ISDBS ||
+           c->delivery_system == SYS_TURBO) {
                p->u.qpsk.symbol_rate = c->symbol_rate;
                p->u.qpsk.fec_inner = c->fec_inner;
-               break;
-       default:
-               break;
        }
 
        /* Fake out a generic DVB-T request so we pass validation in the ioctl 
*/
-- 
1.7.2.5

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to