Commit 9d639b6b authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

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

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent db7c275d
...@@ -231,13 +231,13 @@ static int pci6208_attach(struct comedi_device *dev, ...@@ -231,13 +231,13 @@ static int pci6208_attach(struct comedi_device *dev,
const struct pci6208_board *thisboard; const struct pci6208_board *thisboard;
struct pci6208_private *devpriv; struct pci6208_private *devpriv;
struct comedi_subdevice *s; struct comedi_subdevice *s;
int retval; int ret;
printk(KERN_INFO "comedi%d: pci6208: ", dev->minor); printk(KERN_INFO "comedi%d: pci6208: ", dev->minor);
retval = alloc_private(dev, sizeof(*devpriv)); ret = alloc_private(dev, sizeof(*devpriv));
if (retval < 0) if (ret < 0)
return retval; return ret;
devpriv = dev->private; devpriv = dev->private;
devpriv->pci_dev = pci6208_find_device(dev, it); devpriv->pci_dev = pci6208_find_device(dev, it);
...@@ -245,19 +245,20 @@ static int pci6208_attach(struct comedi_device *dev, ...@@ -245,19 +245,20 @@ static int pci6208_attach(struct comedi_device *dev,
return -EIO; return -EIO;
thisboard = comedi_board(dev); 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, dev_err(dev->class_dev,
"Failed to enable PCI device and request regions\n"); "Failed to enable PCI device and request regions\n");
return -EIO; return ret;
} }
dev->iobase = pci_resource_start(devpriv->pci_dev, 2); dev->iobase = pci_resource_start(devpriv->pci_dev, 2);
dev->board_name = thisboard->name; dev->board_name = thisboard->name;
retval = comedi_alloc_subdevices(dev, 2); ret = comedi_alloc_subdevices(dev, 2);
if (retval) if (ret)
return retval; return ret;
s = dev->subdevices + 0; s = dev->subdevices + 0;
/* analog output subdevice */ /* analog output subdevice */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment