OSDN Git Service

staging: comedi: 8255: check for failure of subdev_8255_init
authorH Hartley Sweeten <hartleys@visionengravers.com>
Wed, 13 Jun 2012 22:42:28 +0000 (15:42 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 14 Jun 2012 00:19:15 +0000 (17:19 -0700)
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>
drivers/staging/comedi/drivers/8255.c

index da86a04..4cdd007 100644 (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);
                }
        }