---

yaml
---
r: 271711
b: refs/heads/master
c: 14f5579
h: refs/heads/master
i:
  271709: 8236233
  271707: f083b33
  271703: 20864b8
  271695: 3cfc7d3
  271679: a62abeb
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83dc314bea4d701e3e5fa048314dfb02f7ef769c
+refs/heads/master: 14f55794b24506a82e995a92e599a3aa9d08781e

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 */