From: Oliver Endriss <o.endriss@gmx.de>
Date: Sat, 25 Aug 2007 16:17:53 +0000 (-0300)
Subject: V4L/DVB (6107): dvb_frontend: clean-up shutdown handling
X-Git-Tag: v2.6.24-rc1~1463^2~162
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=608f62d6ffbc21067e8b9a09f887a5d6cbfe7617;p=linux-2.6

V4L/DVB (6107): dvb_frontend: clean-up shutdown handling

Now dvb_powerdown_on_sleep controls whether
- whether LNB power is turned off
- whether the tuner/frontend enters sleep mode

Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---

diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index 32017f62a8..b203640ef1 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -573,10 +573,9 @@ restart:
 			dvb_frontend_swzigzag(fe);
 	}
 
-	if (dvb_shutdown_timeout) {
-		if (dvb_powerdown_on_sleep)
-			if (fe->ops.set_voltage)
-				fe->ops.set_voltage(fe, SEC_VOLTAGE_OFF);
+	if (dvb_powerdown_on_sleep) {
+		if (fe->ops.set_voltage)
+			fe->ops.set_voltage(fe, SEC_VOLTAGE_OFF);
 		if (fe->ops.tuner_ops.sleep) {
 			fe->ops.tuner_ops.sleep(fe);
 			if (fe->ops.i2c_gate_ctrl)