summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/soc_camera.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-11-12 02:10:06 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-11-12 02:10:06 -0200
commit5021ce47870d8ce6b8efe93938138795dcc16553 (patch)
tree1a21631be8d469ae591d7d997bd1f378287a526a /linux/drivers/media/video/soc_camera.c
parentd2fdf36ebdc0970621958a5b6a7df809ed103bf8 (diff)
parenta3c3f7456fd59e54b7c0333ca9bb32b8be70044e (diff)
downloadmediapointer-dvb-s2-5021ce47870d8ce6b8efe93938138795dcc16553.tar.gz
mediapointer-dvb-s2-5021ce47870d8ce6b8efe93938138795dcc16553.tar.bz2
merge: http://linuxtv.org/hg/~awalls/cx18-bugfix
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/soc_camera.c')
-rw-r--r--linux/drivers/media/video/soc_camera.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/soc_camera.c b/linux/drivers/media/video/soc_camera.c
index 66ebe5956..7a46697c4 100644
--- a/linux/drivers/media/video/soc_camera.c
+++ b/linux/drivers/media/video/soc_camera.c
@@ -29,6 +29,7 @@
#include <media/v4l2-dev.h>
#include <media/videobuf-core.h>
#include <media/soc_camera.h>
+#include "compat.h"
static LIST_HEAD(hosts);
static LIST_HEAD(devices);
@@ -783,7 +784,7 @@ int soc_camera_host_register(struct soc_camera_host *ici)
return -EINVAL;
/* Number might be equal to the platform device ID */
- sprintf(ici->dev.bus_id, "camera_host%d", ici->nr);
+ dev_set_name(&ici->dev, "camera_host%d", ici->nr);
mutex_lock(&list_lock);
list_for_each_entry(ix, &hosts, list) {
@@ -867,8 +868,7 @@ int soc_camera_device_register(struct soc_camera_device *icd)
icd->devnum = num;
icd->dev.bus = &soc_camera_bus_type;
- snprintf(icd->dev.bus_id, sizeof(icd->dev.bus_id),
- "%u-%u", icd->iface, icd->devnum);
+ dev_set_name(&icd->dev, "%u-%u", icd->iface, icd->devnum);
icd->dev.release = dummy_release;