---

yaml --- r: 138210 b: refs/heads/master c: d9109be h: refs/heads/master v: v3
git-mirror · Mar 30, 2009 · 6604471 · 6604471
1 parent 82d523e
commit 6604471
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b80f770a981db1d1f5a41626792c701f8c5bf973
+refs/heads/master: d9109bef4b4f501eee94ae68bf876f765d5c6941
diff --git a/trunk/drivers/media/dvb/frontends/au8522_decoder.c b/trunk/drivers/media/dvb/frontends/au8522_decoder.c
@@ -636,6 +636,7 @@ static int au8522_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc)
 		break;
 	}
 
+	qc->type = 0;
 	return -EINVAL;
 }
 

diff --git a/trunk/drivers/media/video/au0828/au0828-video.c b/trunk/drivers/media/video/au0828/au0828-video.c
@@ -1348,7 +1348,15 @@ static int vidioc_g_chip_ident(struct file *file, void *priv,
 	chip->ident = V4L2_IDENT_NONE;
 	chip->revision = 0;
 
+	if (v4l2_chip_match_host(&chip->match)) {
+		chip->ident = V4L2_IDENT_AU0828;
+		return 0;
+	}
+
 	au0828_call_i2c_clients(dev, VIDIOC_DBG_G_CHIP_IDENT, chip);
+	if (chip->ident == V4L2_IDENT_NONE)
+		return -EINVAL;
+
 	return 0;
 }
 

diff --git a/trunk/include/media/v4l2-chip-ident.h b/trunk/include/media/v4l2-chip-ident.h
@@ -70,6 +70,9 @@ enum {
 	V4L2_IDENT_CX23416 = 416,
 	V4L2_IDENT_CX23418 = 418,
 
+	/* module au0828 */
+	V4L2_IDENT_AU0828 = 828,
+
 	/* module indycam: just ident 2000 */
 	V4L2_IDENT_INDYCAM = 2000,
-Original file line number
+Diff line change
@@ Expand Up @@
     		break;
     	}
+    	qc->type = 0;
     	return -EINVAL;
     }
@@ Expand Down @@