From 04988d9b3f6fe7952dd0241b583632644ee3eaa4 Mon Sep 17 00:00:00 2001 From: Abylay Ospan Date: Sun, 2 Jan 2011 09:15:00 -0300 Subject: [PATCH] --- yaml --- r: 242059 b: refs/heads/master c: 4174ebf5ebd7a09589ff8ff3bc3246ea0a9bd356 h: refs/heads/master i: 242057: b9b84a08024c83e5e5883b82e2ef503213e16a41 242055: f30cad9da01056b358b0560db8efb3a2a96f6f71 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx23885/cx23885-dvb.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6190e2dc6b9d..ff1f8ecb9057 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8af81ddb12cf34e2f6eab7e130f1e55e1911ab8f +refs/heads/master: 4174ebf5ebd7a09589ff8ff3bc3246ea0a9bd356 diff --git a/trunk/drivers/media/video/cx23885/cx23885-dvb.c b/trunk/drivers/media/video/cx23885/cx23885-dvb.c index c0e665506750..3c315f94cc85 100644 --- a/trunk/drivers/media/video/cx23885/cx23885-dvb.c +++ b/trunk/drivers/media/video/cx23885/cx23885-dvb.c @@ -1071,12 +1071,15 @@ static int dvb_register(struct cx23885_tsport *port) fe0->dvb.frontend = dvb_attach(stv0367ter_attach, &netup_stv0367_config[port->nr - 1], &i2c_bus->i2c_adap); - if (fe0->dvb.frontend != NULL) + if (fe0->dvb.frontend != NULL) { if (NULL == dvb_attach(xc5000_attach, fe0->dvb.frontend, &i2c_bus->i2c_adap, &netup_xc5000_config[port->nr - 1])) goto frontend_detach; + /* load xc5000 firmware */ + fe0->dvb.frontend->ops.tuner_ops.init(fe0->dvb.frontend); + } /* MFE frontend 2 */ fe1 = videobuf_dvb_get_frontend(&port->frontends, 2); if (fe1 == NULL)