---

yaml --- r: 331410 b: refs/heads/master c: 74a74b3 h: refs/heads/master v: v3
git-mirror · Sep 28, 2012 · 90c30b9 · 90c30b9
1 parent 9f9a41f
commit 90c30b9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5543a6ac31eb4bfd8d938db6b234ce833d14e04e
+refs/heads/master: 74a74b376c997645b32a4fdf8e76705a00ae097a
diff --git a/trunk/drivers/virtio/virtio_pci.c b/trunk/drivers/virtio/virtio_pci.c
@@ -719,8 +719,10 @@ static int __devinit virtio_pci_probe(struct pci_dev *pci_dev,
 		goto out_enable_device;
 
 	vp_dev->ioaddr = pci_iomap(pci_dev, 0, 0);
-	if (vp_dev->ioaddr == NULL)
+	if (vp_dev->ioaddr == NULL) {
+		err = -ENOMEM;
 		goto out_req_regions;
+	}
 
 	pci_set_drvdata(pci_dev, vp_dev);
 	pci_set_master(pci_dev);