From 3481702c794d58d45ee2539438cf2d8d5c712f1e Mon Sep 17 00:00:00 2001
From: "Igor M. Liplianin" <liplianin@me.by>
Date: Sun, 27 Feb 2011 17:29:55 -0300
Subject: [PATCH] --- yaml --- r: 241988 b: refs/heads/master c:
 738e8ff90fae01dccc9e7f92e0cfa4819567dbb8 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 24af4c0603a1..d24440bd8fb3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b30e0a871389eda9034084faec67d43478fb4c0
+refs/heads/master: 738e8ff90fae01dccc9e7f92e0cfa4819567dbb8
diff --git a/trunk/drivers/media/dvb/frontends/ds3000.c b/trunk/drivers/media/dvb/frontends/ds3000.c
index 7f3d118287c4..90bf573308b0 100644
--- a/trunk/drivers/media/dvb/frontends/ds3000.c
+++ b/trunk/drivers/media/dvb/frontends/ds3000.c
@@ -1220,9 +1220,20 @@ static int ds3000_set_frontend(struct dvb_frontend *fe,
 }
 
 static int ds3000_tune(struct dvb_frontend *fe,
-			struct dvb_frontend_parameters *p)
+			struct dvb_frontend_parameters *p,
+			unsigned int mode_flags,
+			unsigned int *delay,
+			fe_status_t *status)
 {
-	return ds3000_set_frontend(fe, p);
+	if (p) {
+		int ret = ds3000_set_frontend(fe, p);
+		if (ret)
+			return ret;
+	}
+
+	*delay = HZ / 5;
+
+	return ds3000_read_status(fe, status);
 }
 
 static enum dvbfe_algo ds3000_get_algo(struct dvb_frontend *fe)