From 3b7d6c54691228f51d07b1171975ac8cd327fddd Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 4 Oct 2012 09:19:02 -0700 Subject: [PATCH] --- yaml --- r: 329788 b: refs/heads/master c: ce57e981f2b996aaca2031003b3f866368307766 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/base/firmware_class.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ba793929ed0a..477af15e04de 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e1cc485262846dcad931bf85ee655cbbb815bfe6 +refs/heads/master: ce57e981f2b996aaca2031003b3f866368307766 diff --git a/trunk/drivers/base/firmware_class.c b/trunk/drivers/base/firmware_class.c index e85763de928f..81541452887b 100644 --- a/trunk/drivers/base/firmware_class.c +++ b/trunk/drivers/base/firmware_class.c @@ -58,7 +58,6 @@ static noinline long fw_file_size(struct file *file) static bool fw_read_file_contents(struct file *file, struct firmware *fw) { - loff_t pos; long size; char *buf; @@ -68,8 +67,7 @@ static bool fw_read_file_contents(struct file *file, struct firmware *fw) buf = vmalloc(size); if (!buf) return false; - pos = 0; - if (vfs_read(file, buf, size, &pos) != size) { + if (kernel_read(file, 0, buf, size) != size) { vfree(buf); return false; }