diff options
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-streams.c')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-streams.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/media/video/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c index 67699e3f2aaa..e12c6022373e 100644 --- a/drivers/media/video/ivtv/ivtv-streams.c +++ b/drivers/media/video/ivtv/ivtv-streams.c | |||
@@ -245,6 +245,7 @@ static int ivtv_reg_dev(struct ivtv *itv, int type) | |||
245 | { | 245 | { |
246 | struct ivtv_stream *s = &itv->streams[type]; | 246 | struct ivtv_stream *s = &itv->streams[type]; |
247 | int vfl_type = ivtv_stream_info[type].vfl_type; | 247 | int vfl_type = ivtv_stream_info[type].vfl_type; |
248 | const char *name; | ||
248 | int num; | 249 | int num; |
249 | 250 | ||
250 | if (s->vdev == NULL) | 251 | if (s->vdev == NULL) |
@@ -268,24 +269,24 @@ static int ivtv_reg_dev(struct ivtv *itv, int type) | |||
268 | s->vdev = NULL; | 269 | s->vdev = NULL; |
269 | return -ENOMEM; | 270 | return -ENOMEM; |
270 | } | 271 | } |
271 | num = s->vdev->num; | 272 | name = video_device_node_name(s->vdev); |
272 | 273 | ||
273 | switch (vfl_type) { | 274 | switch (vfl_type) { |
274 | case VFL_TYPE_GRABBER: | 275 | case VFL_TYPE_GRABBER: |
275 | IVTV_INFO("Registered device video%d for %s (%d kB)\n", | 276 | IVTV_INFO("Registered device %s for %s (%d kB)\n", |
276 | num, s->name, itv->options.kilobytes[type]); | 277 | name, s->name, itv->options.kilobytes[type]); |
277 | break; | 278 | break; |
278 | case VFL_TYPE_RADIO: | 279 | case VFL_TYPE_RADIO: |
279 | IVTV_INFO("Registered device radio%d for %s\n", | 280 | IVTV_INFO("Registered device %s for %s\n", |
280 | num, s->name); | 281 | name, s->name); |
281 | break; | 282 | break; |
282 | case VFL_TYPE_VBI: | 283 | case VFL_TYPE_VBI: |
283 | if (itv->options.kilobytes[type]) | 284 | if (itv->options.kilobytes[type]) |
284 | IVTV_INFO("Registered device vbi%d for %s (%d kB)\n", | 285 | IVTV_INFO("Registered device %s for %s (%d kB)\n", |
285 | num, s->name, itv->options.kilobytes[type]); | 286 | name, s->name, itv->options.kilobytes[type]); |
286 | else | 287 | else |
287 | IVTV_INFO("Registered device vbi%d for %s\n", | 288 | IVTV_INFO("Registered device %s for %s\n", |
288 | num, s->name); | 289 | name, s->name); |
289 | break; | 290 | break; |
290 | } | 291 | } |
291 | return 0; | 292 | return 0; |