From 19e1db137367780b48cd8c9bbf4bb35add4afacd Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Tue, 1 Sep 2009 19:24:08 -0300 Subject: [PATCH] --- yaml --- r: 161604 b: refs/heads/master c: f51fad85af7b296b56031747c873c309b24ff77c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/dvb-core/dvb_frontend.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 845d06ac25c8..457342c9e71a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 01886255ddf440eb21d3388bfc5343c966904d0e +refs/heads/master: f51fad85af7b296b56031747c873c309b24ff77c diff --git a/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c b/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c index 0cb6c09719f2..d13ebcb0c6b6 100644 --- a/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c +++ b/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c @@ -838,6 +838,15 @@ static int dvb_frontend_check_parameters(struct dvb_frontend *fe, } } + /* check for supported modulation */ + if (fe->ops.info.type == FE_QAM && + (parms->u.qam.modulation > QAM_AUTO || + !((1 << (parms->u.qam.modulation + 10)) & fe->ops.info.caps))) { + printk(KERN_WARNING "DVB: adapter %i frontend %i modulation %u not supported\n", + fe->dvb->num, fe->id, parms->u.qam.modulation); + return -EINVAL; + } + return 0; }