Merge tag 'nfs-for-4.2-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[linux-2.6-block.git] / drivers / base / core.c

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 21d13038534e347f4fcccfc10f532659e2444928..dafae6d2f7ace1fd2941fcbc26ca50fa6450b0f9 100644 (file)
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1303,12 +1303,11 @@ const char *device_get_devnode(struct device *dev,
                return dev_name(dev);
 
        /* replace '!' in the name with '/' */
-       *tmp = kstrdup(dev_name(dev), GFP_KERNEL);
-       if (!*tmp)
+       s = kstrdup(dev_name(dev), GFP_KERNEL);
+       if (!s)
                return NULL;
-       while ((s = strchr(*tmp, '!')))
-               s[0] = '/';
-       return *tmp;
+       strreplace(s, '!', '/');
+       return *tmp = s;
 }
 
 /**