From fe39f4a3f35abc9fb1cfe2ca0d17084fc68f9ca9 Mon Sep 17 00:00:00 2001
From: Mike Isely <isely@pobox.com>
Date: Sat, 7 Mar 2009 00:28:28 -0300
Subject: [PATCH] --- yaml --- r: 138282 b: refs/heads/master c:
 858f910e869d1300c1ab0cadbe9908322f8bfb78 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 .../drivers/media/video/pvrusb2/pvrusb2-hdw.c | 23 +++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2276368793a6..ac56b4fdabbe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20ae26c84e48b95177e334fa9022f68aa3b77df6
+refs/heads/master: 858f910e869d1300c1ab0cadbe9908322f8bfb78
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 2f9667e62bb1..bd4e374e37f8 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -4779,6 +4779,29 @@ static unsigned int pvr2_hdw_report_unlocked(struct pvr2_hdw *hdw,int which,
 			stats.buffers_processed,
 			stats.buffers_failed);
 	}
+	case 6: {
+		struct v4l2_subdev *sd;
+		unsigned int tcnt = 0;
+		unsigned int ccnt;
+		const char *p;
+		unsigned int id;
+		ccnt = scnprintf(buf,
+				 acnt,
+				 "Associted v4l2_subdev drivers:");
+		tcnt += ccnt;
+		v4l2_device_for_each_subdev(sd, &hdw->v4l2_dev) {
+			id = sd->grp_id;
+			p = NULL;
+			if (id < ARRAY_SIZE(module_names)) {
+				p = module_names[id];
+			}
+			if (!p) p = "(unknown)";
+			ccnt = scnprintf(buf + tcnt,
+					 acnt - tcnt,
+					 " %s (%u)", p, id);
+		}
+		return tcnt;
+	}
 	default: break;
 	}
 	return 0;