Merge remote branch 'alsa/fixes' into fix/hda

1 files changed, 5 insertions, 3 deletions

diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index 58a9f9fc609a..d9b08e0f7f55 100644
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
@@ -259,7 +259,7 @@ static struct dma_debug_entry *hash_bucket_find(struct hash_bucket *bucket,
                  * times. Without a hardware IOMMU this results in the
                  * same device addresses being put into the dma-debug
                  * hash multiple times too. This can result in false
-                 * positives being reported. Therfore we implement a
+                 * positives being reported. Therefore we implement a
                  * best-fit algorithm here which returns the entry from
                  * the hash which fits best to the reference value
                  * instead of the first-fit.
@@ -819,9 +819,11 @@ static void check_unmap(struct dma_debug_entry *ref)
                 err_printk(ref->dev, entry, "DMA-API: device driver frees "
                            "DMA memory with different CPU address "
                            "[device address=0x%016llx] [size=%llu bytes] "
-                           "[cpu alloc address=%p] [cpu free address=%p]",
+                           "[cpu alloc address=0x%016llx] "
+                           "[cpu free address=0x%016llx]",
                            ref->dev_addr, ref->size,
-                           (void *)entry->paddr, (void *)ref->paddr);
+                           (unsigned long long)entry->paddr,
+                           (unsigned long long)ref->paddr);
         }
 
         if (ref->sg_call_ents && ref->type == dma_debug_sg &&