1 files changed, 4 insertions, 5 deletions

diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 2fa545a63160..3f914725bda8 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -245,7 +245,8 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
                 if (retval)
                         goto exit;
 
-                call_usermodehelper(argv[0], argv, env->envp, UMH_WAIT_EXEC);
+                retval = call_usermodehelper(argv[0], argv,
+                                             env->envp, UMH_WAIT_EXEC);
         }
 
 exit:
@@ -284,8 +285,7 @@ int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...)
         int len;
 
         if (env->envp_idx >= ARRAY_SIZE(env->envp)) {
-                printk(KERN_ERR "add_uevent_var: too many keys\n");
-                WARN_ON(1);
+                WARN(1, KERN_ERR "add_uevent_var: too many keys\n");
                 return -ENOMEM;
         }
 
@@ -296,8 +296,7 @@ int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...)
         va_end(args);
 
         if (len >= (sizeof(env->buf) - env->buflen)) {
-                printk(KERN_ERR "add_uevent_var: buffer size too small\n");
-                WARN_ON(1);
+                WARN(1, KERN_ERR "add_uevent_var: buffer size too small\n");
                 return -ENOMEM;
         }