From 9cc7b31d3de9d38a24d6e6276529834eb3730573 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Tue, 5 Dec 2006 01:38:58 -0300
Subject: [PATCH] --- yaml --- r: 44147 b: refs/heads/master c:
 22f3f17dd705c476d2c8a2d879ddacaa8f9237e3 h: refs/heads/master i:   44145:
 88f25cb2353a5a77e18e9ceeafa8dd18b711e33a   44143:
 7f2b888ca03fe2f08fffd70943361b1a7ac60649 v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/media/video/cx88/cx88-dvb.c | 38 ++++++++++++-----------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 6fedb8f92bf6..220f57c4f32f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed35526027f3b45a7c799f73916166b1161bf082
+refs/heads/master: 22f3f17dd705c476d2c8a2d879ddacaa8f9237e3
diff --git a/trunk/drivers/media/video/cx88/cx88-dvb.c b/trunk/drivers/media/video/cx88/cx88-dvb.c
index d9907ce8ad4b..694002a7dfc2 100644
--- a/trunk/drivers/media/video/cx88/cx88-dvb.c
+++ b/trunk/drivers/media/video/cx88/cx88-dvb.c
@@ -100,6 +100,26 @@ static struct videobuf_queue_ops dvb_qops = {
 };
 
 /* ------------------------------------------------------------------ */
+
+static int cx88_dvb_bus_ctrl(struct dvb_frontend* fe, int acquire)
+{
+	struct cx8802_dev *dev= fe->dvb->priv;
+	struct cx8802_driver *drv = NULL;
+	int ret = 0;
+
+	drv = cx8802_get_driver(dev, CX88_MPEG_DVB);
+	if (drv) {
+		if(acquire)
+			ret = drv->request_acquire(drv);
+		else
+			ret = drv->request_release(drv);
+	}
+
+	return ret;
+}
+
+/* ------------------------------------------------------------------ */
+
 static int dvico_fusionhdtv_demod_init(struct dvb_frontend* fe)
 {
 	static u8 clock_config []  = { CLOCK_CTL,  0x38, 0x39 };
@@ -287,24 +307,6 @@ static struct cx22702_config hauppauge_hvr_config = {
 	.output_mode   = CX22702_SERIAL_OUTPUT,
 };
 
-static int cx88_dvb_bus_ctrl(struct dvb_frontend* fe,
-	int acquire)
-{
-	struct cx8802_dev *dev= fe->dvb->priv;
-	struct cx8802_driver *drv = NULL;
-	int ret = 0;
-
-	drv = cx8802_get_driver(dev, CX88_MPEG_DVB);
-	if (drv) {
-		if(acquire)
-			ret = drv->request_acquire(drv);
-		else
-			ret = drv->request_release(drv);
-	}
-
-	return ret;
-}
-
 static int or51132_set_ts_param(struct dvb_frontend* fe,
 				int is_punctured)
 {