From c8b1a2baecb102a3fd014173b252f97ad2040a3f Mon Sep 17 00:00:00 2001 From: Markus Rechberger Date: Mon, 13 Aug 2007 19:20:43 +0200 Subject: [PATCH] --- yaml --- r: 67966 b: refs/heads/master c: 109f0e93b6b728f03c1eb4af02bc25d71b646c59 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/base/firmware_class.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4b8aa84178d7..8fca0955f562 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ccd490a3c3d9c5960c738c2720fb2dc6830bc334 +refs/heads/master: 109f0e93b6b728f03c1eb4af02bc25d71b646c59 diff --git a/trunk/drivers/base/firmware_class.c b/trunk/drivers/base/firmware_class.c index 4a1b9bfc5471..0295855a3eef 100644 --- a/trunk/drivers/base/firmware_class.c +++ b/trunk/drivers/base/firmware_class.c @@ -292,8 +292,7 @@ firmware_class_timeout(u_long data) static inline void fw_setup_device_id(struct device *f_dev, struct device *dev) { - /* XXX warning we should watch out for name collisions */ - strlcpy(f_dev->bus_id, dev->bus_id, BUS_ID_SIZE); + snprintf(f_dev->bus_id, BUS_ID_SIZE, "firmware-%s", dev->bus_id); } static int fw_register_device(struct device **dev_p, const char *fw_name,