From f561908699b7116fcc29ed3733ac3661dbdc4ce9 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 27 Dec 2011 08:25:33 -0300 Subject: [PATCH] --- yaml --- r: 285589 b: refs/heads/master c: 63aad05b8d27f4e62227061f7e4ecc7041b92f58 h: refs/heads/master i: 285587: 5f6005806a75645183a73b30aa15ed9cfe4c13d2 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/dvb-core/dvb_frontend.c | 1 - trunk/drivers/media/dvb/frontends/s921.c | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 41ec17c5a4fd..37b858da14e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8de8594a79ae43b08d115c94f09373f6c673f202 +refs/heads/master: 63aad05b8d27f4e62227061f7e4ecc7041b92f58 diff --git a/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c b/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c index 55ca5521bca6..5f5a0caa4507 100644 --- a/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c +++ b/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c @@ -1309,7 +1309,6 @@ static void dtv_set_default_delivery_caps(const struct dvb_frontend *fe, struct p->u.buffer.len = ncaps; return; } - switch (info->type) { case FE_QPSK: p->u.buffer.data[ncaps++] = SYS_DVBS; diff --git a/trunk/drivers/media/dvb/frontends/s921.c b/trunk/drivers/media/dvb/frontends/s921.c index 2e15f92a9a9e..7652d3fac766 100644 --- a/trunk/drivers/media/dvb/frontends/s921.c +++ b/trunk/drivers/media/dvb/frontends/s921.c @@ -440,6 +440,7 @@ static int s921_get_frontend(struct dvb_frontend *fe, /* FIXME: Probably it is possible to get it from regs f1 and f2 */ p->frequency = state->currentfreq; + p->delivery_system = SYS_ISDBT; return 0; }