diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-11-12 13:10:49 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-11-12 13:10:49 +1100 |
| commit | 832c5113900a1b1f8e295f9bef0ec373a4f65712 (patch) | |
| tree | 14f23403f2258cb915feae57def803f59c3c1ac0 /drivers/media/video/soc_camera.c | |
| parent | 3033be5964c9b7cd02953ea52dc32274ae6e450d (diff) | |
| parent | 236e8f9c338ebf66a85c2078207024d877378671 (diff) | |
Merge commit 'v4l-dvb/master'
Diffstat (limited to 'drivers/media/video/soc_camera.c')
| -rw-r--r-- | drivers/media/video/soc_camera.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c index 66ebe5956a87..28cf5c94bd61 100644 --- a/drivers/media/video/soc_camera.c +++ b/drivers/media/video/soc_camera.c @@ -783,7 +783,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 +867,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; |