提交 3e189f08 编写于 作者: H H Hartley Sweeten 提交者: Greg Kroah-Hartman

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: NH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 34cfcf9a
...@@ -342,7 +342,7 @@ int subdev_8255_init_irq(struct comedi_device *dev, struct comedi_subdevice *s, ...@@ -342,7 +342,7 @@ int subdev_8255_init_irq(struct comedi_device *dev, struct comedi_subdevice *s,
int ret; int ret;
ret = subdev_8255_init(dev, s, io, iobase); ret = subdev_8255_init(dev, s, io, iobase);
if (ret < 0) if (ret)
return ret; return ret;
s->do_cmdtest = subdev_8255_cmdtest; s->do_cmdtest = subdev_8255_cmdtest;
...@@ -399,7 +399,9 @@ static int dev_8255_attach(struct comedi_device *dev, ...@@ -399,7 +399,9 @@ static int dev_8255_attach(struct comedi_device *dev,
s->type = COMEDI_SUBD_UNUSED; s->type = COMEDI_SUBD_UNUSED;
} else { } 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); dev_info(dev->class_dev, "0x%04lx\n", iobase);
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册