aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-06-30 19:02:47 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-20 06:15:39 -0400
commitdc5e42fb20229487ef11fd6fa0cdb7b7d42170f6 (patch)
tree08f392d2b05d9a0881552a6fbd24f4e3f3e740ea
parente8b934de12989d1704e7df7ebb408a6021f08442 (diff)
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>
-rw-r--r--drivers/media/video/ivtv/ivtv-streams.c4
1 files changed, 2 insertions, 2 deletions
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)
213 if (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) { 213 if (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) {
214 s->v4l2dev->type |= VID_TYPE_MPEG_DECODER; 214 s->v4l2dev->type |= VID_TYPE_MPEG_DECODER;
215 } 215 }
216 snprintf(s->v4l2dev->name, sizeof(s->v4l2dev->name), "ivtv%d", 216 snprintf(s->v4l2dev->name, sizeof(s->v4l2dev->name), "ivtv%d %s",
217 itv->num); 217 itv->num, s->name);
218 218
219 s->v4l2dev->minor = minor; 219 s->v4l2dev->minor = minor;
220 s->v4l2dev->dev = &itv->dev->dev; 220 s->v4l2dev->dev = &itv->dev->dev;