diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-11 08:35:53 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-11 08:35:53 -0200 |
| commit | f162a609cfacfb032e13cad27ca09f2ac6fd1cbe (patch) | |
| tree | c61e5cd3d6fa8d0eb8b99a9aeeeca2c7cf4cf9d8 /drivers/media/video/soc_camera.c | |
| parent | 1d6782bda5c1fb2bca44af50647b45427d8ef4ec (diff) | |
| parent | 977610834961b2f588a0e51e5d1381003fc3125a (diff) | |
Merge branch 'next' of ../devel
* 'next' of ../devel: (166 commits)
V4L/DVB (9572a): Whitespace cleanup
V4L/DVB (9570): uvcvideo: Handle failed video GET_{MIN|MAX|DEF} requests more gracefully
V4L/DVB (9563): gspca: Let gspca handle the webcam 0471:0328 instead of sn9c102.
V4L/DVB (9560): gspca: Let gspca handle the webcam 0c45:602c instead of sn9c102.
V4L/DVB (9548): gspca: Fix Kconfig CodingStyle
V4L/DVB (9540): dsbr100: add disabled controls and fix version
V4L/DVB (9539): dsbr100: add suspend and resume
V4L/DVB (9572): Whitespace cleanup
V4L/DVB (9569): uvcvideo: Sort the frame descriptors during parsing
V4L/DVB (9568): uvcvideo: Add support for Lenovo Thinkpad SL500 integrated webcam
V4L/DVB (9567): uvcvideo: Add support for Samsung Q310 integrated webcam
V4L/DVB (9565): gspca: Remove empty lines in traces.
V4L/DVB (9562): gspca: Set the default frame rate to 30 fps for sensor ov764x in ov519.
V4L/DVB (9561): gspca: Cleanup the source of ov519.
V4L/DVB (9553): gspca: Webcam 145f:013a added in pac207.
V4L/DVB (9552): gspca: Simplify the ISOC packet scanning in tv8532.
V4L/DVB (9548): gspca: Properly indent Kconfig
V4L/DVB (9547): gspca: Version change.
V4L/DVB (9546): gspca: Bad scanning of ISOC packets in tv8532.
V4L/DVB (9545): gspca: Add a flag for empty ISOC packets.
...
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; |