dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

staging: comedi: 8255: check for failure of subdev_8255_init 

The initialization of the 8255 subdevice can fail. Make sure to
check for it.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2012-06-13 15:42:28 -07:00 committed by Greg Kroah-Hartman
parent 34cfcf9acc
commit 3e189f08ef
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/comedi/drivers/8255.c
View File

@ -342,7 +342,7 @@ int subdev_8255_init_irq(struct comedi_device *dev, struct comedi_subdevice *s,
int ret;
ret = subdev_8255_init(dev, s, io, iobase);
if (ret < 0)
if (ret)
return ret;
s->do_cmdtest = subdev_8255_cmdtest;
@ -399,7 +399,9 @@ static int dev_8255_attach(struct comedi_device *dev,
s->type = COMEDI_SUBD_UNUSED;
} else {
subdev_8255_init(dev, s, NULL, iobase);
ret = subdev_8255_init(dev, s, NULL, iobase);
if (ret)
return ret;
dev_info(dev->class_dev, "0x%04lx\n", iobase);
}
}