Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2 files changed, 9 insertions, 5 deletions

diff --git a/crypto/scatterwalk.c b/crypto/scatterwalk.c
index 35172d3f043b..81afd1790a1d 100644
--- a/crypto/scatterwalk.c
+++ b/crypto/scatterwalk.c
@@ -59,8 +59,12 @@ EXPORT_SYMBOL_GPL(scatterwalk_map);
 static void scatterwalk_pagedone(struct scatter_walk *walk, int out,
                                  unsigned int more)
 {
-        if (out)
-                flush_dcache_page(scatterwalk_page(walk));
+        if (out) {
+                struct page *page;
+
+                page = walk->sg->page + ((walk->offset - 1) >> PAGE_SHIFT);
+                flush_dcache_page(page);
+        }
 
         if (more) {
                 walk->offset += PAGE_SIZE - 1;
@@ -91,6 +95,8 @@ void scatterwalk_copychunks(void *buf, struct scatter_walk *walk,
                 memcpy_dir(buf, vaddr, len_this_page, out);
                 scatterwalk_unmap(vaddr, out);
 
+                scatterwalk_advance(walk, len_this_page);
+
                 if (nbytes == len_this_page)
                         break;
 
@@ -99,7 +105,5 @@ void scatterwalk_copychunks(void *buf, struct scatter_walk *walk,
 
                 scatterwalk_pagedone(walk, out, 1);
         }
-
-        scatterwalk_advance(walk, nbytes);
 }
 EXPORT_SYMBOL_GPL(scatterwalk_copychunks);
diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index f5e9da319ece..8eaa5aa210b0 100644
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -768,7 +768,7 @@ static void test_deflate(void)
         tv = (void *)tvmem;
 
         tfm = crypto_alloc_comp("deflate", 0, CRYPTO_ALG_ASYNC);
-        if (tfm == NULL) {
+        if (IS_ERR(tfm)) {
                 printk("failed to load transform for deflate\n");
                 return;
         }