evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: cb_pcidda: check for subdev_8255_init() failure

Browse source 
The subdev_8255_init() can fail, make sure to check for it.

This board has two 8255 subdevices, one at iobase PCI bar2 and one
at iobase PCI bar2 + 4. Init the subdevices using a for() loop to
make the code a bit more concise.

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-10-24 16:31:14 -07:00 • committed by Greg Kroah-Hartman
parent 2730c736d9
commit 618351aed1
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/staging/comedi/drivers/cb_pcidda.c
View file

@ -521,10 +521,12 @@ static int cb_pcidda_attach_pci(struct comedi_device *dev,
s->insn_write = cb_pcidda_ao_winsn;
/* two 8255 digital io subdevices */
s = &dev->subdevices[1];
subdev_8255_init(dev, s, NULL, iobase_8255);
s = &dev->subdevices[2];
subdev_8255_init(dev, s, NULL, iobase_8255 + PORT2A);
for (i = 0; i < 2; i++) {
s = &dev->subdevices[1 + i];
ret = subdev_8255_init(dev, s, NULL, iobase_8255 + (i * 4));
if (ret)
return ret;
}
/* Read the caldac eeprom data */
for (i = 0; i < EEPROM_SIZE; i++)