diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 12:45:28 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 12:45:28 -0800 |
| commit | bfa271d026fef5d8db9a95342c38eab6f7b287a2 (patch) | |
| tree | f8312f1f96edd4025640039e0f25a685f8185573 /drivers | |
| parent | 123f794fa7d592644881a20801638d88521d0b06 (diff) | |
| parent | 969affd276dec81a35a5ad10d4e05e62e93b380b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
sysfs: remove BUG_ON() from sysfs_remove_group()
Driver core: Revert "Fix Firmware class name collision"
Block: Fix whole_disk attribute bug
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/base/firmware_class.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index 0295855a3ee..4a1b9bfc547 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -292,7 +292,8 @@ firmware_class_timeout(u_long data) static inline void fw_setup_device_id(struct device *f_dev, struct device *dev) { - snprintf(f_dev->bus_id, BUS_ID_SIZE, "firmware-%s", dev->bus_id); + /* XXX warning we should watch out for name collisions */ + strlcpy(f_dev->bus_id, dev->bus_id, BUS_ID_SIZE); } static int fw_register_device(struct device **dev_p, const char *fw_name, |