---

yaml --- r: 103903 b: refs/heads/master c: dc5e42f h: refs/heads/master i: 103901: 393c816 103899: ba95574 103895: 914dec9 103887: ea76800 103871: 4421a8b v: v3
git-mirror · Jul 20, 2008 · 521912a · 521912a
1 parent df37bd6
commit 521912a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8b934de12989d1704e7df7ebb408a6021f08442
+refs/heads/master: dc5e42fb20229487ef11fd6fa0cdb7b7d42170f6
diff --git a/trunk/drivers/media/video/ivtv/ivtv-streams.c b/trunk/drivers/media/video/ivtv/ivtv-streams.c
@@ -213,8 +213,8 @@ static int ivtv_prep_dev(struct ivtv *itv, int type)
 	if (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) {
 		s->v4l2dev->type |= VID_TYPE_MPEG_DECODER;
 	}
-	snprintf(s->v4l2dev->name, sizeof(s->v4l2dev->name), "ivtv%d",
-			itv->num);
+	snprintf(s->v4l2dev->name, sizeof(s->v4l2dev->name), "ivtv%d %s",
+			itv->num, s->name);
 
 	s->v4l2dev->minor = minor;
 	s->v4l2dev->dev = &itv->dev->dev;