Re: [PATCH] Firmware class name collision

["Markus Rechberger" <markus.rechberger@amd.com>]

Hi Marcel,

Marcel Holtmann wrote:
> Hi Markus,
>
>   
>> following patch fixes the i2c name collision with i2c-dev.
>>
>> http://mcentral.de/wiki/index.php/Bugtracker#i2c_core_problem
>>
>> This issue has been experienced with em28xx and saa7133 based devices.
>> I discussed that problem with Jean Delvare a while ago and he proposed 
>> to add a prefix to the class name.
>>
>> http://mcentral.de/~mrec/patches/firmware_class_name_collision.diff
>>
>> Signed-off-by: Markus Rechberger <markus.rechberger@amd.com>
>>
>> index b24efd4..bfc54a1 100644
>> --- a/drivers/base/firmware_class.c
>> +++ b/drivers/base/firmware_class.c
>> @@ -297,8 +297,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, "fw-%s", dev->bus_id);
>>  }
>>     
>
> I would prefer if we use "firmware-%s" since the "fw" might collide with
> the new Firewire stack. Please change that and I agree.
>
>   

firmware-%s sounds more informative and cannot be mistaken with firewire 
yes.

Signed-off-by: Markus Rechberger <markus.rechberger@amd.com>

http://mcentral.de/~mrec/patches/firmware_class_name_collision_2.diff

diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index b24efd4..bfc54a1 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -297,8 +297,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,

> Acked-by: Marcel Holtmann <marcel@holtmann.org>
>
> Regards
>
> Marcel
>
>
>
>
>