---

yaml --- r: 325529 b: refs/heads/master c: 41f821d h: refs/heads/master i: 325527: 57fefe8 v: v3
git-mirror · Sep 26, 2012 · 60edfc7 · 60edfc7
1 parent eef79c7
commit 60edfc7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c843aa7731c774a78a31b6dab371024c4756d38
+refs/heads/master: 41f821d07729d1c3d59d1ebebf4c57e2ffe0a37c
diff --git a/trunk/drivers/staging/comedi/drivers/s626.c b/trunk/drivers/staging/comedi/drivers/s626.c
@@ -2445,7 +2445,6 @@ static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
 /*   uint16_t	StartVal; */
 /*   uint16_t	index; */
 /*   unsigned int data[16]; */
-	int result;
 	int i;
 	int ret;
 	resource_size_t resourceStart;
@@ -2458,11 +2457,9 @@ static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
 	if (alloc_private(dev, sizeof(struct s626_private)) < 0)
 		return -ENOMEM;
 
-	result = comedi_pci_enable(pcidev, dev->board_name);
-	if (result < 0) {
-		printk(KERN_ERR "s626_attach: comedi_pci_enable fails\n");
-		return -ENODEV;
-	}
+	ret = comedi_pci_enable(pcidev, dev->board_name);
+	if (ret)
+		return ret;
 	devpriv->got_regions = 1;
 
 	resourceStart = pci_resource_start(pcidev, 0);