From 699d12e368080f1478e5c679d759dee66ba62f66 Mon Sep 17 00:00:00 2001
From: Ian Abbott <abbotti@mev.co.uk>
Date: Fri, 15 Mar 2013 13:39:52 +0000
Subject: [PATCH] --- yaml --- r: 363512 b: refs/heads/master c:
 a14592896023adcab12307774c89284ce0744ce2 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d59893cf6865..d2afba326aae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84b44d08993ffe762d9a86ee2243239350b871a4
+refs/heads/master: a14592896023adcab12307774c89284ce0744ce2
diff --git a/trunk/drivers/staging/comedi/drivers/ni_labpc.c b/trunk/drivers/staging/comedi/drivers/ni_labpc.c
index 62ec39dea97d..152dc844fa96 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_labpc.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_labpc.c
@@ -804,7 +804,8 @@ void labpc_common_detach(struct comedi_device *dev)
 		mite_unsetup(devpriv->mite);
 		mite_free(devpriv->mite);
 	}
-	comedi_pci_disable(dev);
+	if (thisboard->bustype == pci_bustype)
+		comedi_pci_disable(dev);
 #endif
 };
 EXPORT_SYMBOL_GPL(labpc_common_detach);