Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git

[linux-2.6-microblaze.git] / drivers / soundwire / slave.c

diff --git a/drivers/soundwire/slave.c b/drivers/soundwire/slave.c
index 0eed38a..669d757 100644 (file)
--- a/drivers/soundwire/slave.c
+++ b/drivers/soundwire/slave.c
@@ -39,12 +39,12 @@ int sdw_slave_add(struct sdw_bus *bus,
 
        if (id->unique_id == SDW_IGNORED_UNIQUE_ID) {
                /* name shall be sdw:link:mfg:part:class */
-               dev_set_name(&slave->dev, "sdw:%x:%x:%x:%x",
+               dev_set_name(&slave->dev, "sdw:%01x:%04x:%04x:%02x",
                             bus->link_id, id->mfg_id, id->part_id,
                             id->class_id);
        } else {
                /* name shall be sdw:link:mfg:part:class:unique */
-               dev_set_name(&slave->dev, "sdw:%x:%x:%x:%x:%x",
+               dev_set_name(&slave->dev, "sdw:%01x:%04x:%04x:%02x:%01x",
                             bus->link_id, id->mfg_id, id->part_id,
                             id->class_id, id->unique_id);
        }