Commit 3e189f08 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 34cfcf9a

drivers/staging/comedi/drivers/8255.c

+4 −2
Original line number Diff line number Diff line
@@ -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);

		}

	}