---

yaml --- r: 329788 b: refs/heads/master c: ce57e98 h: refs/heads/master v: v3
git-mirror · Oct 4, 2012 · 3b7d6c5 · 3b7d6c5
1 parent 9f8bb0b
commit 3b7d6c5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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;
 	}