diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-06-19 10:54:00 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-18 23:19:29 -0400 |
commit | 581644d9c95dd04aa46267aa0b6b5619d02b02ea (patch) | |
tree | 8458e45033945d0a8f5b87fa6ed15e701db780bc /drivers/media/video/ivtv | |
parent | 22e221258b56cc1a4dc5a9fb2c26f4d6ed9dde81 (diff) |
V4L/DVB (12723): ivtv/cx18: replace 'kernel number' with 'device node number'.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/ivtv')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-driver.c | 2 | ||||
-rw-r--r-- | drivers/media/video/ivtv/ivtv-streams.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c index 63ea0fb66063..463ec3457d7b 100644 --- a/drivers/media/video/ivtv/ivtv-driver.c +++ b/drivers/media/video/ivtv/ivtv-driver.c | |||
@@ -246,7 +246,7 @@ MODULE_PARM_DESC(newi2c, | |||
246 | "\t\t\t-1 is autodetect, 0 is off, 1 is on\n" | 246 | "\t\t\t-1 is autodetect, 0 is off, 1 is on\n" |
247 | "\t\t\tDefault is autodetect"); | 247 | "\t\t\tDefault is autodetect"); |
248 | 248 | ||
249 | MODULE_PARM_DESC(ivtv_first_minor, "Set kernel number assigned to first card"); | 249 | MODULE_PARM_DESC(ivtv_first_minor, "Set device node number assigned to first card"); |
250 | 250 | ||
251 | MODULE_AUTHOR("Kevin Thayer, Chris Kennedy, Hans Verkuil"); | 251 | MODULE_AUTHOR("Kevin Thayer, Chris Kennedy, Hans Verkuil"); |
252 | MODULE_DESCRIPTION("CX23415/CX23416 driver"); | 252 | MODULE_DESCRIPTION("CX23415/CX23416 driver"); |
diff --git a/drivers/media/video/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c index 15da01710efc..23400035240a 100644 --- a/drivers/media/video/ivtv/ivtv-streams.c +++ b/drivers/media/video/ivtv/ivtv-streams.c | |||
@@ -262,7 +262,7 @@ static int ivtv_reg_dev(struct ivtv *itv, int type) | |||
262 | 262 | ||
263 | /* Register device. First try the desired minor, then any free one. */ | 263 | /* Register device. First try the desired minor, then any free one. */ |
264 | if (video_register_device(s->vdev, vfl_type, num)) { | 264 | if (video_register_device(s->vdev, vfl_type, num)) { |
265 | IVTV_ERR("Couldn't register v4l2 device for %s kernel number %d\n", | 265 | IVTV_ERR("Couldn't register v4l2 device for %s (device node number %d)\n", |
266 | s->name, num); | 266 | s->name, num); |
267 | video_device_release(s->vdev); | 267 | video_device_release(s->vdev); |
268 | s->vdev = NULL; | 268 | s->vdev = NULL; |