3 files changed, 15 insertions, 14 deletions
diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index 13ef2338be41..518aea714d21 100644
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
@@ -430,7 +430,7 @@ static struct dma_debug_entry *__dma_entry_alloc(void)
 */
 static struct dma_debug_entry *dma_entry_alloc(void)
 {
-        struct dma_debug_entry *entry = NULL;
+        struct dma_debug_entry *entry;
        unsigned long flags;
        spin_lock_irqsave(&free_entries_lock, flags);
@@ -438,11 +438,14 @@ static struct dma_debug_entry *dma_entry_alloc(void)
        if (list_empty(&free_entries)) {
                pr_err("DMA-API: debugging out of memory - disabling\n");
                global_disable = true;
-                goto out;
+                spin_unlock_irqrestore(&free_entries_lock, flags);
+                return NULL;
        }
        entry = __dma_entry_alloc();
+        spin_unlock_irqrestore(&free_entries_lock, flags);
 #ifdef CONFIG_STACKTRACE
        entry->stacktrace.max_entries = DMA_DEBUG_STACKTRACE_ENTRIES;
        entry->stacktrace.entries = entry->st_entries;
@@ -450,9 +453,6 @@ static struct dma_debug_entry *dma_entry_alloc(void)
        save_stack_trace(&entry->stacktrace);
 #endif
-out:
-        spin_unlock_irqrestore(&free_entries_lock, flags);
        return entry;
 }
diff --git a/lib/kobject.c b/lib/kobject.c
index 21dee7c19afd..aeefa8bc8b1c 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -192,14 +192,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 "
+                        WARN(1, "%s failed for %s with "
-                               "-EEXIST, don't try to register things with "
+                             "-EEXIST, don't try to register things with "
-                               "the same name in the same directory.\n",
+                             "the same name in the same directory.\n",
-                               __func__, kobject_name(kobj));
+                             __func__, kobject_name(kobj));
                else
-                        printk(KERN_ERR "%s failed for %s (%d)\n",
+                        WARN(1, "%s failed for %s (error: %d parent: %s)\n",
-                               __func__, kobject_name(kobj), error);
+                             __func__, kobject_name(kobj), error,
-                dump_stack();
+                             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 2f526627e4f5..0c505361da19 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;
+        const int n = a->nlimbs;
-        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++)