From 3a787d3ac36976dfd982730252f550d1f138d801 Mon Sep 17 00:00:00 2001
From: Mike Isely <isely@pobox.com>
Date: Sat, 7 Mar 2009 01:39:40 -0300
Subject: [PATCH] --- yaml --- r: 138294 b: refs/heads/master c:
 5f757ddd5f193f54a5a7498d32568b630583503e h: refs/heads/master v: v3

---
 [refs]                                          |  2 +-
 trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 06f89bab5a67..8beee1ec178a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ab8d295156a43fc2751483d2f82a63c97489f89
+refs/heads/master: 5f757ddd5f193f54a5a7498d32568b630583503e
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 937c85c5c037..b10b90d97578 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -4855,7 +4855,7 @@ static unsigned int pvr2_hdw_report_unlocked(struct pvr2_hdw *hdw,int which,
 		unsigned int id;
 		ccnt = scnprintf(buf,
 				 acnt,
-				 "Associted v4l2_subdev drivers:");
+				 "Associated v4l2_subdev drivers:");
 		tcnt += ccnt;
 		v4l2_device_for_each_subdev(sd, &hdw->v4l2_dev) {
 			id = sd->grp_id;
@@ -4863,10 +4863,16 @@ static unsigned int pvr2_hdw_report_unlocked(struct pvr2_hdw *hdw,int which,
 			if (id < ARRAY_SIZE(module_names)) {
 				p = module_names[id];
 			}
-			if (!p) p = "(unknown)";
-			ccnt = scnprintf(buf + tcnt,
-					 acnt - tcnt,
-					 " %s (%u)", p, id);
+			if (p) {
+				ccnt = scnprintf(buf + tcnt,
+						 acnt - tcnt,
+						 " %s", p);
+			} else {
+				ccnt = scnprintf(buf + tcnt,
+						 acnt - tcnt,
+						 " (unknown id=%u)", id);
+			}
+			tcnt += ccnt;
 		}
 		return tcnt;
 	}