diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-05 20:04:56 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-05 20:04:56 -0200 |
| commit | 7af33dc182a51e3feda1246207c939d8459dbd61 (patch) | |
| tree | 81416520e5321725fa97909e5652ed7c87598893 /linux/drivers/media/video/v4l2-dev.c | |
| parent | 1272389ee0a46d702d0dc471d791b9fae7668aed (diff) | |
| parent | b4efb4ebbf8e3e7d3d0230bf4a811f7dafeef9a0 (diff) | |
| download | mediapointer-dvb-s2-7af33dc182a51e3feda1246207c939d8459dbd61.tar.gz mediapointer-dvb-s2-7af33dc182a51e3feda1246207c939d8459dbd61.tar.bz2 | |
merge: http://linuxtv.org/hg/~anttip/af9015
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/v4l2-dev.c')
| -rw-r--r-- | linux/drivers/media/video/v4l2-dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/v4l2-dev.c b/linux/drivers/media/video/v4l2-dev.c index 742efc74c..3b8f33c8d 100644 --- a/linux/drivers/media/video/v4l2-dev.c +++ b/linux/drivers/media/video/v4l2-dev.c @@ -381,7 +381,7 @@ int video_register_device_index(struct video_device *vfd, int type, int nr, #else if (vfd->parent) vfd->dev.parent = vfd->parent; - sprintf(vfd->dev.bus_id, "%s%d", name_base, nr); + dev_set_name(&vfd->dev, "%s%d", name_base, nr); ret = device_register(&vfd->dev); #endif if (ret < 0) { |