---

yaml --- r: 271756 b: refs/heads/master c: ba08831 h: refs/heads/master v: v3
git-mirror · Sep 6, 2011 · 4b90541 · 4b90541
1 parent cee840c
commit 4b90541
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23aefb7e0e5e8b3766545af51b88fc3eb07532ba
+refs/heads/master: ba08831b84211e48ae4ce6272eebeade8d41cff4
diff --git a/trunk/drivers/media/video/bt819.c b/trunk/drivers/media/video/bt819.c
@@ -229,7 +229,7 @@ static int bt819_status(struct v4l2_subdev *sd, u32 *pstatus, v4l2_std_id *pstd)
 	if (pstd)
 		*pstd = std;
 	if (pstatus)
-		*pstatus = status;
+		*pstatus = res;
 
 	v4l2_dbg(1, debug, sd, "get status %x\n", status);
 	return 0;

diff --git a/trunk/drivers/media/video/vpx3220.c b/trunk/drivers/media/video/vpx3220.c
@@ -331,7 +331,7 @@ static int vpx3220_status(struct v4l2_subdev *sd, u32 *pstatus, v4l2_std_id *pst
 	if (pstd)
 		*pstd = std;
 	if (pstatus)
-		*pstatus = status;
+		*pstatus = res;
 	return 0;
 }