From 90c30b979bd2a939e56d6e07a32489fae12ed499 Mon Sep 17 00:00:00 2001
From: Peter Senna Tschudin <peter.senna@gmail.com>
Date: Mon, 17 Sep 2012 19:31:17 +0200
Subject: [PATCH] --- yaml --- r: 331410 b: refs/heads/master c:
 74a74b376c997645b32a4fdf8e76705a00ae097a h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/virtio/virtio_pci.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5e24ec21f468..8afc7383bc90 100644
--- 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
index 42b20769d122..c33aea36598a 100644
--- 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);