From 06165042580f6793d7ba6d79a088ef479458541d Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Fri, 7 Sep 2012 17:48:26 -0700
Subject: [PATCH] --- yaml --- r: 324971 b: refs/heads/master c:
 39780a1caf92342c4deb0d14d39703cf5c70cdac h: refs/heads/master i:   324969:
 ddac30c9b83f24fafdfe2ee544f7170f058b3193   324967:
 5a0bc6dd41716838c23c8b614ec1af5c5ee3ccc8 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/staging/comedi/drivers/me4000.c | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 346c2c049082..977b4d009d31 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe531d12acff926628df11df6d476474383a9f3f
+refs/heads/master: 39780a1caf92342c4deb0d14d39703cf5c70cdac
diff --git a/trunk/drivers/staging/comedi/drivers/me4000.c b/trunk/drivers/staging/comedi/drivers/me4000.c
index f2c8d040f1f8..219ad6c5a174 100644
--- a/trunk/drivers/staging/comedi/drivers/me4000.c
+++ b/trunk/drivers/staging/comedi/drivers/me4000.c
@@ -1776,15 +1776,9 @@ static int me4000_attach_pci(struct comedi_device *dev,
 		return result;
 
 	info->plx_regbase = pci_resource_start(pcidev, 1);
-	if (!info->plx_regbase)
-		return -ENODEV;
-
 	dev->iobase = pci_resource_start(pcidev, 2);
-	if (!dev->iobase)
-		return -ENODEV;
-
 	info->timer_regbase = pci_resource_start(pcidev, 3);
-	if (!info->timer_regbase)
+	if (!info->plx_regbase || !dev->iobase || !info->timer_regbase)
 		return -ENODEV;
 
 	dev->irq = pcidev->irq;