From 0b9295fa6c0ddcd6d1427281ae022e7e9da960eb Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Sun, 10 Jan 2010 05:56:46 -0300
Subject: [PATCH] --- yaml --- r: 181503 b: refs/heads/master c:
 e34d375aa6dade342a266d40c6142d7f36e18683 h: refs/heads/master i:   181501:
 4dd3be87a4927760c8ce04251521df756f658a87   181499:
 de066ae6596c4dc175f18766847da1607c6c3cb4   181495:
 91fdc2c13b517cb35bf295df027a886e0f716610   181487:
 4a247f261fa435fe0be42441aa49a2eec78bdedd   181471:
 83434ab7387c1d412d2b8c658a987e29505f5d7d   181439:
 d79d058bbcdd3300dee80e52540efabb896fd443   181375:
 c49625dcb74aa803581233a48c05f5b96d4b3492   181247:
 ea02f4fd95a6a74886335a82fdc6acd59758ccf7 v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/media/video/cx18/cx18-dvb.c | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 8dd6992b220b..cb595100c159 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8231152f74dd9bd6f76036cfd7fbbf94ad0073d8
+refs/heads/master: e34d375aa6dade342a266d40c6142d7f36e18683
diff --git a/trunk/drivers/media/video/cx18/cx18-dvb.c b/trunk/drivers/media/video/cx18/cx18-dvb.c
index 71ad2d1b4c2c..0ad5b63d27fe 100644
--- a/trunk/drivers/media/video/cx18/cx18-dvb.c
+++ b/trunk/drivers/media/video/cx18/cx18-dvb.c
@@ -213,10 +213,14 @@ static int cx18_dvb_start_feed(struct dvb_demux_feed *feed)
 {
 	struct dvb_demux *demux = feed->demux;
 	struct cx18_stream *stream = (struct cx18_stream *) demux->priv;
-	struct cx18 *cx = stream->cx;
+	struct cx18 *cx;
 	int ret;
 	u32 v;
 
+	if (!stream)
+		return -EINVAL;
+
+	cx = stream->cx;
 	CX18_DEBUG_INFO("Start feed: pid = 0x%x index = %d\n",
 			feed->pid, feed->index);
 
@@ -253,9 +257,6 @@ static int cx18_dvb_start_feed(struct dvb_demux_feed *feed)
 	if (!demux->dmx.frontend)
 		return -EINVAL;
 
-	if (!stream)
-		return -EINVAL;
-
 	mutex_lock(&stream->dvb.feedlock);
 	if (stream->dvb.feeding++ == 0) {
 		CX18_DEBUG_INFO("Starting Transport DMA\n");
@@ -279,13 +280,14 @@ static int cx18_dvb_stop_feed(struct dvb_demux_feed *feed)
 {
 	struct dvb_demux *demux = feed->demux;
 	struct cx18_stream *stream = (struct cx18_stream *)demux->priv;
-	struct cx18 *cx = stream->cx;
+	struct cx18 *cx;
 	int ret = -EINVAL;
 
-	CX18_DEBUG_INFO("Stop feed: pid = 0x%x index = %d\n",
-			feed->pid, feed->index);
-
 	if (stream) {
+		cx = stream->cx;
+		CX18_DEBUG_INFO("Stop feed: pid = 0x%x index = %d\n",
+				feed->pid, feed->index);
+
 		mutex_lock(&stream->dvb.feedlock);
 		if (--stream->dvb.feeding == 0) {
 			CX18_DEBUG_INFO("Stopping Transport DMA\n");