Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[~andy/linux] / arch / powerpc / platforms / powernv / opal-flash.c

diff --git a/arch/powerpc/platforms/powernv/opal-flash.c b/arch/powerpc/platforms/powernv/opal-flash.c
index 16e571ba4c600a1ce9846122eed6456894e2d770..714ef972406bcacf66a4a896283c6fb25963ca16 100644 (file)
--- a/arch/powerpc/platforms/powernv/opal-flash.c
+++ b/arch/powerpc/platforms/powernv/opal-flash.c
@@ -105,7 +105,7 @@ struct image_header_t {
 
 struct validate_flash_t {
        int             status;         /* Return status */
-       void            *buf;           /* Candiate image buffer */
+       void            *buf;           /* Candidate image buffer */
        uint32_t        buf_size;       /* Image size */
        uint32_t        result;         /* Update results token */
 };
@@ -481,7 +481,7 @@ static int alloc_image_buf(char *buffer, size_t count)
 
        memcpy(&image_header, (void *)buffer, sizeof(struct image_header_t));
        image_data.size = be32_to_cpu(image_header.size);
-       pr_debug("FLASH: Candiate image size = %u\n", image_data.size);
+       pr_debug("FLASH: Candidate image size = %u\n", image_data.size);
 
        if (image_data.size > MAX_IMAGE_SIZE) {
                pr_warn("FLASH: Too large image\n");