diff options
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/radio/radio-tea5764.c | 3 | ||||
-rw-r--r-- | drivers/media/video/v4l2-device.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/radio/radio-tea5764.c b/drivers/media/radio/radio-tea5764.c index 4d35308fc1ff..393623818ade 100644 --- a/drivers/media/radio/radio-tea5764.c +++ b/drivers/media/radio/radio-tea5764.c | |||
@@ -298,7 +298,8 @@ static int vidioc_querycap(struct file *file, void *priv, | |||
298 | 298 | ||
299 | strlcpy(v->driver, dev->dev.driver->name, sizeof(v->driver)); | 299 | strlcpy(v->driver, dev->dev.driver->name, sizeof(v->driver)); |
300 | strlcpy(v->card, dev->name, sizeof(v->card)); | 300 | strlcpy(v->card, dev->name, sizeof(v->card)); |
301 | snprintf(v->bus_info, sizeof(v->bus_info), "I2C:%s", dev->dev.bus_id); | 301 | snprintf(v->bus_info, sizeof(v->bus_info), |
302 | "I2C:%s", dev_name(&dev->dev)); | ||
302 | v->version = RADIO_VERSION; | 303 | v->version = RADIO_VERSION; |
303 | v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO; | 304 | v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO; |
304 | return 0; | 305 | return 0; |
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 | } |