---

yaml --- r: 362767 b: refs/heads/master c: 08b4212 h: refs/heads/master i: 362765: 12e5471 362763: 119d696 362759: 5ef7b67 362751: 9fc882b v: v3
git-mirror · Apr 17, 2013 · 71d96b4 · 71d96b4
1 parent 017659e
commit 71d96b4
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: 7919e91b34316ee30b14334389e005eb2e9b8e39
+refs/heads/master: 08b421245692f3d10f010f02dae69df6a305271c
diff --git a/trunk/arch/s390/pci/pci.c b/trunk/arch/s390/pci/pci.c
@@ -249,10 +249,9 @@ int zpci_fmb_enable_device(struct zpci_dev *zdev)
 	if (zdev->fmb)
 		return -EINVAL;
 
-	zdev->fmb = kmem_cache_alloc(zdev_fmb_cache, GFP_KERNEL);
+	zdev->fmb = kmem_cache_zalloc(zdev_fmb_cache, GFP_KERNEL);
 	if (!zdev->fmb)
 		return -ENOMEM;
-	memset(zdev->fmb, 0, sizeof(*zdev->fmb));
 	WARN_ON((u64) zdev->fmb & 0xf);
 
 	args.fmb_addr = virt_to_phys(zdev->fmb);