From 5eeabcbb5574e4d0456edd2184afdebde2505f24 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Mon, 8 Aug 2011 11:54:36 -0300 Subject: [PATCH] --- yaml --- r: 271711 b: refs/heads/master c: 14f55794b24506a82e995a92e599a3aa9d08781e h: refs/heads/master i: 271709: 82362336044c49a2b984e2e793ddd6128b1cf36f 271707: f083b3333e46e96a5593408789fb09b3541f9ba7 271703: 20864b84a4d249ad91852733f2e78dbb7332a3cb 271695: 3cfc7d3f349dd2676e5bd8b773d7fc10abaf8bdc 271679: a62abeb1ef059eef73c99b2bad538e0456be541d v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/dvb-core/dvb_frontend.c | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index d8741c2cdf2c..8f24528a3599 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83dc314bea4d701e3e5fa048314dfb02f7ef769c +refs/heads/master: 14f55794b24506a82e995a92e599a3aa9d08781e diff --git a/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c b/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c index d02c32e754f4..d218fe2fd061 100644 --- a/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c +++ b/trunk/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 */