diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2009-03-24 19:38:22 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-24 19:38:22 -0400 |
commit | c3ef01ce4f73f41e99b2a5f0796f1f1a1daaaaa2 (patch) | |
tree | 1cdcc03103b2b050abcd924bec3f3f6624129179 /drivers/media/video/v4l2-device.c | |
parent | 2ead054cd26752c7ce47dfbf320dd021ef70682d (diff) |
v4l: struct device - replace bus_id with dev_name(), dev_set_name()
Cc: mchehab@infradead.org
Cc: linux-media@vger.kernel.org
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Diffstat (limited to 'drivers/media/video/v4l2-device.c')
-rw-r--r-- | drivers/media/video/v4l2-device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/v4l2-device.c b/drivers/media/video/v4l2-device.c index cf9d4c7f571a..8a4b74f3129f 100644 --- a/drivers/media/video/v4l2-device.c +++ b/drivers/media/video/v4l2-device.c | |||
@@ -34,7 +34,7 @@ int v4l2_device_register(struct device *dev, struct v4l2_device *v4l2_dev) | |||
34 | spin_lock_init(&v4l2_dev->lock); | 34 | spin_lock_init(&v4l2_dev->lock); |
35 | v4l2_dev->dev = dev; | 35 | v4l2_dev->dev = dev; |
36 | snprintf(v4l2_dev->name, sizeof(v4l2_dev->name), "%s %s", | 36 | snprintf(v4l2_dev->name, sizeof(v4l2_dev->name), "%s %s", |
37 | dev->driver->name, dev->bus_id); | 37 | dev->driver->name, dev_name(dev)); |
38 | dev_set_drvdata(dev, v4l2_dev); | 38 | dev_set_drvdata(dev, v4l2_dev); |
39 | return 0; | 39 | return 0; |
40 | } | 40 | } |