lkml.org 
[lkml]   [2012]   [Jun]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 07/19] staging: comedi: adl_pci6208: pass on the error code from comedi_pci_enable
Date
Return the actual error code from comedi_pci_enable instead of
assuming -EIO on failure. Also, shorten the local variable name 'retval'
to 'ret'.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/staging/comedi/drivers/adl_pci6208.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/comedi/drivers/adl_pci6208.c b/drivers/staging/comedi/drivers/adl_pci6208.c
index e2ca685..8ec2660 100644
--- a/drivers/staging/comedi/drivers/adl_pci6208.c
+++ b/drivers/staging/comedi/drivers/adl_pci6208.c
@@ -231,13 +231,13 @@ static int pci6208_attach(struct comedi_device *dev,
const struct pci6208_board *thisboard;
struct pci6208_private *devpriv;
struct comedi_subdevice *s;
- int retval;
+ int ret;

printk(KERN_INFO "comedi%d: pci6208: ", dev->minor);

- retval = alloc_private(dev, sizeof(*devpriv));
- if (retval < 0)
- return retval;
+ ret = alloc_private(dev, sizeof(*devpriv));
+ if (ret < 0)
+ return ret;
devpriv = dev->private;

devpriv->pci_dev = pci6208_find_device(dev, it);
@@ -245,19 +245,20 @@ static int pci6208_attach(struct comedi_device *dev,
return -EIO;
thisboard = comedi_board(dev);

- if (comedi_pci_enable(devpriv->pci_dev, "adl_pci6208") < 0) {
+ ret = comedi_pci_enable(devpriv->pci_dev, "adl_pci6208");
+ if (ret) {
dev_err(dev->class_dev,
"Failed to enable PCI device and request regions\n");
- return -EIO;
+ return ret;
}

dev->iobase = pci_resource_start(devpriv->pci_dev, 2);

dev->board_name = thisboard->name;

- retval = comedi_alloc_subdevices(dev, 2);
- if (retval)
- return retval;
+ ret = comedi_alloc_subdevices(dev, 2);
+ if (ret)
+ return ret;

s = dev->subdevices + 0;
/* analog output subdevice */
--
1.7.11


\
 
 \ /
  Last update: 2012-06-28 00:41    [W:0.276 / U:0.144 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site