From cea8540c12bd4e81121c31c2d22231cd11a63022 Mon Sep 17 00:00:00 2001
From: Saqeb Akhter <johoja@gmail.com>
Date: Thu, 29 Jun 2006 20:29:29 -0300
Subject: [PATCH] --- yaml --- r: 31471 b: refs/heads/master c:
 ccd214b27341485bd471e4e031c33d2ba1a9aaac h: refs/heads/master i:   31469:
 7d4b25d560f3ad161be74e94d471587744862d05   31467:
 30e5c70549ebf1a34eeb73f55868d706a0a1024b   31463:
 6b54433012295272ff92599e51ad62aeb975e387   31455:
 1a2f3e2f0dc10607ffe5262ba17bede290bfd7c1 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/media/dvb/frontends/cx24123.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 930fc4e2b78a..c602d5314686 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70d906354fd7fe3956366ade15ab36d6b7aed971
+refs/heads/master: ccd214b27341485bd471e4e031c33d2ba1a9aaac
diff --git a/trunk/drivers/media/dvb/frontends/cx24123.c b/trunk/drivers/media/dvb/frontends/cx24123.c
index f2f795cba56a..274a87b7a5d5 100644
--- a/trunk/drivers/media/dvb/frontends/cx24123.c
+++ b/trunk/drivers/media/dvb/frontends/cx24123.c
@@ -670,10 +670,10 @@ static int cx24123_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage
 	switch (voltage) {
 	case SEC_VOLTAGE_13:
 		dprintk("%s: setting voltage 13V\n", __FUNCTION__);
-		return cx24123_writereg(state, 0x29, val | 0x80);
+		return cx24123_writereg(state, 0x29, val & 0x7f);
 	case SEC_VOLTAGE_18:
 		dprintk("%s: setting voltage 18V\n", __FUNCTION__);
-		return cx24123_writereg(state, 0x29, val & 0x7f);
+		return cx24123_writereg(state, 0x29, val | 0x80);
 	default:
 		return -EINVAL;
 	};