From d1566f4643c216ad8355a1ddf741dd64357e4a3f Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Tue, 15 Feb 2011 01:10:20 -0300
Subject: [PATCH] --- yaml --- r: 241855 b: refs/heads/master c:
 0ae79d993cd5ce425bedebcbd2f8c4fa310acfe6 h: refs/heads/master i:   241853:
 3abc11ab04b2b903d0df0864074bc51ff10583ef   241851:
 e566daf441598541ddf489320337ff146245b9b4   241847:
 7b5a9c927dd4be5854aa0d1e6485c4d0d97f0a74   241839:
 bb405e67fb21e8fcb183d942f7978fabd5d4a8cf   241823:
 1616877fe6762760289224328275e5a5d38ddf69   241791:
 65a31bf80c1dfe75fbac882072950bcdf5561662 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/media/video/tuner-core.c | 23 +++++++++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 759f01b8269d..9871bf938c4f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a34ec5f3743950cadb8f512c884b8c9dbaa9a7a5
+refs/heads/master: 0ae79d993cd5ce425bedebcbd2f8c4fa310acfe6
diff --git a/trunk/drivers/media/video/tuner-core.c b/trunk/drivers/media/video/tuner-core.c
index 2a0bea145a78..dcf03face265 100644
--- a/trunk/drivers/media/video/tuner-core.c
+++ b/trunk/drivers/media/video/tuner-core.c
@@ -128,7 +128,7 @@ struct tuner {
  * tuner attach/detach logic
  */
 
-/** This macro allows us to probe dynamically, avoiding static links */
+/* This macro allows us to probe dynamically, avoiding static links */
 #ifdef CONFIG_MEDIA_ATTACH
 #define tuner_symbol_probe(FUNCTION, ARGS...) ({ \
 	int __r = -EINVAL; \
@@ -412,13 +412,20 @@ static void set_type(struct i2c_client *c, unsigned int type,
 	return;
 }
 
-/*
- * This function apply tuner config to tuner specified
- * by tun_setup structure. I addr is unset, then admin status
- * and tun addr status is more precise then current status,
- * it's applied. Otherwise status and type are applied only to
- * tuner with exactly the same addr.
-*/
+/**
+ * tuner_s_type_addr - Sets the tuner type for a device
+ *
+ * @sd:		subdev descriptor
+ * @tun_setup:	type to be associated to a given tuner i2c address
+ *
+ * This function applys the tuner config to tuner specified
+ * by tun_setup structure.
+ * If tuner I2C address is UNSET, then it will only set the device
+ * if the tuner supports the mode specified in the call.
+ * If the address is specified, the change will be applied only if
+ * tuner I2C address matches.
+ * The call can change the tuner number and the tuner mode.
+ */
 static int tuner_s_type_addr(struct v4l2_subdev *sd,
 			     struct tuner_setup *tun_setup)
 {