---

yaml --- r: 259831 b: refs/heads/master c: 6a587e8 h: refs/heads/master i: 259829: 3709b52 259827: 2cd0be1 259823: 1411684 v: v3
git-mirror · Jul 5, 2011 · d6e0122 · d6e0122
1 parent 7b03e33
commit d6e0122
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67f72befc7b7c5c9bd9fcdc2642b79180a9b9678
+refs/heads/master: 6a587e835e3a8ea2fe9e8fd038553f2090666bd5
diff --git a/trunk/drivers/staging/zram/zram_drv.c b/trunk/drivers/staging/zram/zram_drv.c
@@ -194,8 +194,7 @@ static void handle_uncompressed_page(struct zram *zram,
 	unsigned char *user_mem, *cmem;
 
 	user_mem = kmap_atomic(page, KM_USER0);
-	cmem = kmap_atomic(zram->table[index].page, KM_USER1) +
-			zram->table[index].offset;
+	cmem = kmap_atomic(zram->table[index].page, KM_USER1);
 
 	memcpy(user_mem, cmem, PAGE_SIZE);
 	kunmap_atomic(user_mem, KM_USER0);