diff options
Diffstat (limited to 'drivers/media/video/cx18/cx18-streams.c')
-rw-r--r-- | drivers/media/video/cx18/cx18-streams.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/media/video/cx18/cx18-streams.c b/drivers/media/video/cx18/cx18-streams.c index c398651dd74c..987a9308d938 100644 --- a/drivers/media/video/cx18/cx18-streams.c +++ b/drivers/media/video/cx18/cx18-streams.c | |||
@@ -219,6 +219,7 @@ static int cx18_reg_dev(struct cx18 *cx, int type) | |||
219 | { | 219 | { |
220 | struct cx18_stream *s = &cx->streams[type]; | 220 | struct cx18_stream *s = &cx->streams[type]; |
221 | int vfl_type = cx18_stream_info[type].vfl_type; | 221 | int vfl_type = cx18_stream_info[type].vfl_type; |
222 | const char *name; | ||
222 | int num, ret; | 223 | int num, ret; |
223 | 224 | ||
224 | /* TODO: Shouldn't this be a VFL_TYPE_TRANSPORT or something? | 225 | /* TODO: Shouldn't this be a VFL_TYPE_TRANSPORT or something? |
@@ -258,31 +259,30 @@ static int cx18_reg_dev(struct cx18 *cx, int type) | |||
258 | s->video_dev = NULL; | 259 | s->video_dev = NULL; |
259 | return ret; | 260 | return ret; |
260 | } | 261 | } |
261 | num = s->video_dev->num; | 262 | |
263 | name = video_device_node_name(s->video_dev); | ||
262 | 264 | ||
263 | switch (vfl_type) { | 265 | switch (vfl_type) { |
264 | case VFL_TYPE_GRABBER: | 266 | case VFL_TYPE_GRABBER: |
265 | CX18_INFO("Registered device video%d for %s " | 267 | CX18_INFO("Registered device %s for %s (%d x %d.%02d kB)\n", |
266 | "(%d x %d.%02d kB)\n", | 268 | name, s->name, cx->stream_buffers[type], |
267 | num, s->name, cx->stream_buffers[type], | ||
268 | cx->stream_buf_size[type] / 1024, | 269 | cx->stream_buf_size[type] / 1024, |
269 | (cx->stream_buf_size[type] * 100 / 1024) % 100); | 270 | (cx->stream_buf_size[type] * 100 / 1024) % 100); |
270 | break; | 271 | break; |
271 | 272 | ||
272 | case VFL_TYPE_RADIO: | 273 | case VFL_TYPE_RADIO: |
273 | CX18_INFO("Registered device radio%d for %s\n", | 274 | CX18_INFO("Registered device %s for %s\n", name, s->name); |
274 | num, s->name); | ||
275 | break; | 275 | break; |
276 | 276 | ||
277 | case VFL_TYPE_VBI: | 277 | case VFL_TYPE_VBI: |
278 | if (cx->stream_buffers[type]) | 278 | if (cx->stream_buffers[type]) |
279 | CX18_INFO("Registered device vbi%d for %s " | 279 | CX18_INFO("Registered device %s for %s " |
280 | "(%d x %d bytes)\n", | 280 | "(%d x %d bytes)\n", |
281 | num, s->name, cx->stream_buffers[type], | 281 | name, s->name, cx->stream_buffers[type], |
282 | cx->stream_buf_size[type]); | 282 | cx->stream_buf_size[type]); |
283 | else | 283 | else |
284 | CX18_INFO("Registered device vbi%d for %s\n", | 284 | CX18_INFO("Registered device %s for %s\n", |
285 | num, s->name); | 285 | name, s->name); |
286 | break; | 286 | break; |
287 | } | 287 | } |
288 | 288 | ||