diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-13 20:13:17 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-13 20:13:17 -0200 |
| commit | adff0f37dc0f0ab48850eaad267223c634e975a2 (patch) | |
| tree | c6aa3e259581abeb64eb7590b29a60354ec5a5ee /linux/drivers/media/video/v4l2-device.c | |
| parent | e2b4212172d81f17f5e4741766f032d06e83ce4f (diff) | |
| parent | f25ebd42bbb82866dfbbba5b7bfc651315fa6416 (diff) | |
| download | mediapointer-dvb-s2-adff0f37dc0f0ab48850eaad267223c634e975a2.tar.gz mediapointer-dvb-s2-adff0f37dc0f0ab48850eaad267223c634e975a2.tar.bz2 | |
merge: http://linuxtv.org/hg/~tap/bttv
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/v4l2-device.c')
| -rw-r--r-- | linux/drivers/media/video/v4l2-device.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/v4l2-device.c b/linux/drivers/media/video/v4l2-device.c index cf9d4c7f5..e84925976 100644 --- a/linux/drivers/media/video/v4l2-device.c +++ b/linux/drivers/media/video/v4l2-device.c @@ -23,6 +23,7 @@ #include <linux/i2c.h> #include <linux/videodev2.h> #include <media/v4l2-device.h> +#include "compat.h" int v4l2_device_register(struct device *dev, struct v4l2_device *v4l2_dev) { @@ -34,7 +35,7 @@ int v4l2_device_register(struct device *dev, struct v4l2_device *v4l2_dev) spin_lock_init(&v4l2_dev->lock); v4l2_dev->dev = dev; snprintf(v4l2_dev->name, sizeof(v4l2_dev->name), "%s %s", - dev->driver->name, dev->bus_id); + dev->driver->name, dev_name(dev)); dev_set_drvdata(dev, v4l2_dev); return 0; } |