---

yaml --- r: 241988 b: refs/heads/master c: 738e8ff h: refs/heads/master v: v3
git-mirror · Mar 21, 2011 · 3481702 · 3481702
1 parent e15b6e9
commit 3481702
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git 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
@@ -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)