From 894bfe1e8df417a7ad1caacf8d679fd83ad9a3fe Mon Sep 17 00:00:00 2001 From: "Igor M. Liplianin" Date: Tue, 8 May 2012 04:08:04 -0300 Subject: [PATCH] --- yaml --- r: 357233 b: refs/heads/master c: 081416e62d516a6412225751c9c4a3807b2374b9 h: refs/heads/master i: 357231: 5b07e07084c5788895b09ad1b59975bdea2767f3 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb-frontends/m88rs2000.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0f045f9d8a85..98a26f31c954 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 955d00ac7a193e9c29a897cd5d731a84e3850217 +refs/heads/master: 081416e62d516a6412225751c9c4a3807b2374b9 diff --git a/trunk/drivers/media/dvb-frontends/m88rs2000.c b/trunk/drivers/media/dvb-frontends/m88rs2000.c index 633815ed90ca..5d3d5dd62daa 100644 --- a/trunk/drivers/media/dvb-frontends/m88rs2000.c +++ b/trunk/drivers/media/dvb-frontends/m88rs2000.c @@ -458,7 +458,11 @@ static int m88rs2000_init(struct dvb_frontend *fe) deb_info("m88rs2000: init chip\n"); /* Setup frontend from shutdown/cold */ - ret = m88rs2000_tab_set(state, m88rs2000_setup); + if (state->config->inittab) + ret = m88rs2000_tab_set(state, + (struct inittab *)state->config->inittab); + else + ret = m88rs2000_tab_set(state, m88rs2000_setup); return ret; }