Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9def5ed7 authored by Steven Toth's avatar Steven Toth Committed by Mauro Carvalho Chehab
Browse files

[media] cx23885: Bugfix /sys/class/video4linux/videoX/name truncation 



The card names are being truncated in the video4linux sys class name file.
Prior to this patch they were shown as:
cx23885[0] mpeg (Hauppauge WinT
cx23885[0] video (Hauppauge WinT
cx23885[0] vbi (Hauppauge WinT

After this patch they are shown as:
Hauppauge WinTV-HVR1850 (video)
Hauppauge WinTV-HVR1850 (mpeg)
Hauppauge WinTV-HVR1850 (vbi)

Signed-off-by: default avatarSteven Toth <stoth@kernellabs.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 09b3bc22

drivers/media/video/cx23885/cx23885-417.c

+2 −2
Original line number Diff line number Diff line
@@ -1733,8 +1733,8 @@ static struct video_device *cx23885_video_dev_alloc( 
	if (NULL == vfd)

		return NULL;

	*vfd = *template;

	snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)", dev->name,

		type, cx23885_boards[tsport->dev->board].name);

	snprintf(vfd->name, sizeof(vfd->name), "%s (%s)",

		cx23885_boards[tsport->dev->board].name, type);

	vfd->parent  = &pci->dev;

	vfd->release = video_device_release;

	return vfd;

drivers/media/video/cx23885/cx23885-video.c

+2 −2
Original line number Diff line number Diff line
@@ -344,8 +344,8 @@ static struct video_device *cx23885_vdev_init(struct cx23885_dev *dev, 
	*vfd = *template;

	vfd->v4l2_dev = &dev->v4l2_dev;

	vfd->release = video_device_release;

	snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)",

		 dev->name, type, cx23885_boards[dev->board].name);

	snprintf(vfd->name, sizeof(vfd->name), "%s (%s)",

		 cx23885_boards[dev->board].name, type);

	video_set_drvdata(vfd, dev);

	return vfd;

}