---

yaml --- r: 337713 b: refs/heads/master c: 4ecd622 h: refs/heads/master i: 337711: 3a78d47 v: v3
git-mirror · Nov 13, 2012 · 060d49c · 060d49c
1 parent 4c91e27
commit 060d49c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f488ba8633fe77910ea0ba80ec762d9c34af1b6
+refs/heads/master: 4ecd6228acc8c3bb5c7d18bae57ce13685936e6d
diff --git a/trunk/drivers/staging/comedi/drivers/jr3_pci.c b/trunk/drivers/staging/comedi/drivers/jr3_pci.c
@@ -703,7 +703,7 @@ static int __devinit jr3_pci_auto_attach(struct comedi_device *dev,
 
 	result = comedi_pci_enable(pcidev, "jr3_pci");
 	if (result < 0)
-		return -EIO;
+		return result;
 
 	dev->iobase = 1;	/* the "detach" needs this */
 	devpriv->iobase = ioremap(pci_resource_start(pcidev, 0),