renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-20 11:13:58 +08:00
Code

staging: comedi: adl_pci6208: pass on the error code from comedi_pci_enable

Browse Source 
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2012-06-27 14:59:19 -07:00 committed by Greg Kroah-Hartman
parent db7c275d9f
commit 9d639b6b25
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/staging/comedi/drivers/adl_pci6208.c
View File

@ -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 */