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

Commit 581644d9 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (12723): ivtv/cx18: replace 'kernel number' with 'device node number'. 



Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 22e22125

drivers/media/video/cx18/cx18-driver.c

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ MODULE_PARM_DESC(enc_pcm_bufs, 
		 "Number of encoder PCM buffers\n"

		 "\t\t\tDefault is computed from other enc_pcm_* parameters");



MODULE_PARM_DESC(cx18_first_minor, "Set kernel number assigned to first card");

MODULE_PARM_DESC(cx18_first_minor, "Set device node number assigned to first card");



MODULE_AUTHOR("Hans Verkuil");

MODULE_DESCRIPTION("CX23418 driver");

drivers/media/video/cx18/cx18-streams.c

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ static int cx18_reg_dev(struct cx18 *cx, int type) 
	/* Register device. First try the desired minor, then any free one. */

	ret = video_register_device(s->video_dev, vfl_type, num);

	if (ret < 0) {

		CX18_ERR("Couldn't register v4l2 device for %s kernel number %d\n",

		CX18_ERR("Couldn't register v4l2 device for %s (device node number %d)\n",

			s->name, num);

		video_device_release(s->video_dev);

		s->video_dev = NULL;

drivers/media/video/ivtv/ivtv-driver.c

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ MODULE_PARM_DESC(newi2c, 
		 "\t\t\t-1 is autodetect, 0 is off, 1 is on\n"

		 "\t\t\tDefault is autodetect");



MODULE_PARM_DESC(ivtv_first_minor, "Set kernel number assigned to first card");

MODULE_PARM_DESC(ivtv_first_minor, "Set device node number assigned to first card");



MODULE_AUTHOR("Kevin Thayer, Chris Kennedy, Hans Verkuil");

MODULE_DESCRIPTION("CX23415/CX23416 driver");

drivers/media/video/ivtv/ivtv-streams.c

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static int ivtv_reg_dev(struct ivtv *itv, int type) 


	/* Register device. First try the desired minor, then any free one. */

	if (video_register_device(s->vdev, vfl_type, num)) {

		IVTV_ERR("Couldn't register v4l2 device for %s kernel number %d\n",

		IVTV_ERR("Couldn't register v4l2 device for %s (device node number %d)\n",

				s->name, num);

		video_device_release(s->vdev);

		s->vdev = NULL;