---

yaml --- r: 190131 b: refs/heads/master c: 76ef964 h: refs/heads/master i: 190129: 87d262f 190127: afa9f61 v: v3
git-mirror · Apr 22, 2010 · 02887ab · 02887ab
1 parent 761ece7
commit 02887ab
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 157a1a27d5921fc94db8c14e0d01363d13de99b5
+refs/heads/master: 76ef964c78797f9baed7c2f9a58f696e86d8a048
diff --git a/trunk/drivers/s390/char/zcore.c b/trunk/drivers/s390/char/zcore.c
@@ -638,11 +638,7 @@ static int __init zcore_reipl_init(void)
 		rc = memcpy_hsa_kernel(ipl_block, ipib_info.ipib, PAGE_SIZE);
 	else
 		rc = memcpy_real(ipl_block, (void *) ipib_info.ipib, PAGE_SIZE);
-	if (rc) {
-		free_page((unsigned long) ipl_block);
-		return rc;
-	}
-	if (csum_partial(ipl_block, ipl_block->hdr.len, 0) !=
+	if (rc || csum_partial(ipl_block, ipl_block->hdr.len, 0) !=
 	    ipib_info.checksum) {
 		TRACE("Checksum does not match\n");
 		free_page((unsigned long) ipl_block);