1 files changed, 6 insertions, 8 deletions

diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
index c5ace190bfe6..1644e6fd2c89 100644
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
@@ -1163,6 +1163,7 @@ static int nodemgr_uevent(struct class_device *cdev, char **envp, int num_envp,
         struct unit_directory *ud;
         int i = 0;
         int length = 0;
+        int retval = 0;
         /* ieee1394:venNmoNspNverN */
         char buf[8 + 1 + 3 + 8 + 2 + 8 + 2 + 8 + 3 + 8 + 1];
 
@@ -1176,14 +1177,11 @@ static int nodemgr_uevent(struct class_device *cdev, char **envp, int num_envp,
 
 #define PUT_ENVP(fmt,val)                                       \
 do {                                                            \
-        int printed;                                            \
-        envp[i++] = buffer;                                     \
-        printed = snprintf(buffer, buffer_size - length,        \
-                           fmt, val);                           \
-        if ((buffer_size - (length+printed) <= 0) || (i >= num_envp))   \
-                return -ENOMEM;                                 \
-        length += printed+1;                                    \
-        buffer += printed+1;                                    \
+        retval = add_uevent_var(envp, num_envp, &i,             \
+                                buffer, buffer_size, &length,   \
+                                fmt, val);                      \
+        if (retval)                                             \
+                return retval;                                  \
 } while (0)
 
         PUT_ENVP("VENDOR_ID=%06x", ud->vendor_id);