From ee872030b49065ca367d6d8415c3d3541838aa81 Mon Sep 17 00:00:00 2001 From: Devin Heitmueller Date: Mon, 4 Jul 2011 21:55:01 -0300 Subject: [PATCH] --- yaml --- r: 254959 b: refs/heads/master c: 2d1969312d6319d28ae9609a84f969b6933bd51c h: refs/heads/master i: 254957: 15c5be2558a57ec9ca7122d845e98ea2e133fd2d 254955: 4ada8487ad26fb1dcae867b2656ad904ddf2cb54 254951: 2ab395cbc4e85e008b14f3d21d36f1f64e6ab723 254943: 516451bc6860c417c1a905b14605950086e79585 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/dvb-core/dvb_frontend.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1282a1c0d8e5..8e8df50c9f94 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 42a741dcf1472cea55193ea8611db3d67808ce22 +refs/heads/master: 2d1969312d6319d28ae9609a84f969b6933bd51c diff --git a/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c b/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c index 98278041d75f..5b6b451d4694 100644 --- a/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c +++ b/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c @@ -1988,6 +1988,14 @@ static int dvb_frontend_open(struct inode *inode, struct file *file) if (dvbdev->users == -1 && fe->ops.ts_bus_ctrl) { if ((ret = fe->ops.ts_bus_ctrl(fe, 1)) < 0) goto err0; + + /* If we took control of the bus, we need to force + reinitialization. This is because many ts_bus_ctrl() + functions strobe the RESET pin on the demod, and if the + frontend thread already exists then the dvb_init() routine + won't get called (which is what usually does initial + register configuration). */ + fepriv->reinitialise = 1; } if ((ret = dvb_generic_open (inode, file)) < 0)