From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Mon, 30 Jun 2008 23:02:47 +0000 (-0300)
Subject: V4L/DVB (8171): ivtv: put back full device name, people relied on it in udev rules.
X-Git-Tag: firefly_0821_release~19561^2~158
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=dc5e42fb20229487ef11fd6fa0cdb7b7d42170f6;p=firefly-linux-kernel-4.4.55.git

V4L/DVB (8171): ivtv: put back full device name, people relied on it in udev rules.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---

diff --git a/drivers/media/video/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c
index 8e3addd45090..f8883b487f4a 100644
--- a/drivers/media/video/ivtv/ivtv-streams.c
+++ b/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;