2 files changed, 10 insertions, 9 deletions

diff --git a/lib/kobject.c b/lib/kobject.c
index bbffa2110d4..38fcc60e661 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -190,14 +190,14 @@ static int kobject_add_internal(struct kobject *kobj)
 
                 /* be noisy on error issues */
                 if (error == -EEXIST)
-                        printk(KERN_ERR "%s failed for %s with "
-                               "-EEXIST, don't try to register things with "
-                               "the same name in the same directory.\n",
-                               __func__, kobject_name(kobj));
+                        WARN(1, "%s failed for %s with "
+                             "-EEXIST, don't try to register things with "
+                             "the same name in the same directory.\n",
+                             __func__, kobject_name(kobj));
                 else
-                        printk(KERN_ERR "%s failed for %s (%d)\n",
-                               __func__, kobject_name(kobj), error);
-                dump_stack();
+                        WARN(1, "%s failed for %s (error: %d parent: %s)\n",
+                             __func__, kobject_name(kobj), error,
+                             parent ? kobject_name(parent) : "'none'");
         } else
                 kobj->state_in_sysfs = 1;
 
diff --git a/lib/mpi/mpi-bit.c b/lib/mpi/mpi-bit.c
index 2f526627e4f..0c505361da1 100644
--- a/lib/mpi/mpi-bit.c
+++ b/lib/mpi/mpi-bit.c
@@ -177,8 +177,8 @@ int mpi_rshift(MPI x, MPI a, unsigned n)
  */
 int mpi_lshift_limbs(MPI a, unsigned int count)
 {
-        mpi_ptr_t ap = a->d;
-        int n = a->nlimbs;
+        const int n = a->nlimbs;
+        mpi_ptr_t ap;
         int i;
 
         if (!count || !n)
@@ -187,6 +187,7 @@ int mpi_lshift_limbs(MPI a, unsigned int count)
         if (RESIZE_IF_NEEDED(a, n + count) < 0)
                 return -ENOMEM;
 
+        ap = a->d;
         for (i = n - 1; i >= 0; i--)
                 ap[i + count] = ap[i];
         for (i = 0; i < count; i++)