Merge branch 'for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[deliverable/linux.git] / drivers / base / firmware_class.c

diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index f3f7215ad378d6a971fa643fe3a656ee064fe5fa..773fc30997697711c2ff926ab49ed88d272cdbcc 100644 (file)
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -258,7 +258,7 @@ static void __fw_free_buf(struct kref *ref)
                vunmap(buf->data);
                for (i = 0; i < buf->nr_pages; i++)
                        __free_page(buf->pages[i]);
-               kfree(buf->pages);
+               vfree(buf->pages);
        } else
 #endif
                vfree(buf->data);
@@ -635,7 +635,7 @@ static ssize_t firmware_loading_store(struct device *dev,
                if (!test_bit(FW_STATUS_DONE, &fw_buf->status)) {
                        for (i = 0; i < fw_buf->nr_pages; i++)
                                __free_page(fw_buf->pages[i]);
-                       kfree(fw_buf->pages);
+                       vfree(fw_buf->pages);
                        fw_buf->pages = NULL;
                        fw_buf->page_array_size = 0;
                        fw_buf->nr_pages = 0;
@@ -746,8 +746,7 @@ static int fw_realloc_buffer(struct firmware_priv *fw_priv, int min_size)
                                         buf->page_array_size * 2);
                struct page **new_pages;
 
-               new_pages = kmalloc(new_array_size * sizeof(void *),
-                                   GFP_KERNEL);
+               new_pages = vmalloc(new_array_size * sizeof(void *));
                if (!new_pages) {
                        fw_load_abort(fw_priv);
                        return -ENOMEM;
@@ -756,7 +755,7 @@ static int fw_realloc_buffer(struct firmware_priv *fw_priv, int min_size)
                       buf->page_array_size * sizeof(void *));
                memset(&new_pages[buf->page_array_size], 0, sizeof(void *) *
                       (new_array_size - buf->page_array_size));
-               kfree(buf->pages);
+               vfree(buf->pages);
                buf->pages = new_pages;
                buf->page_array_size = new_array_size;
        }