Skip to contentSkip to conversation

staging: comedi: 8255: check for failure of subdev_8255_init

PATCH In review H Hartley Sweeten 1 participant 1 message Jun 13, 2012 Staging

lore
Share & tools
lore

H Hartley Sweeten

author
#0 lore raw

PATCH 9/15 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 <[email protected]>
Cc Ian Abbott <[email protected]>
Cc Frank Mori Hess <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
---
 drivers/staging/comedi/drivers/8255.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
drivers/staging/comedi/drivers/8255.c +4 -2
index da86a04..4cdd007 100644
@@ -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);
 		}
 	}
Signature · 1 line
1.7.7