From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Thu, 18 Apr 2013 21:32:48 +0000 (-0700)
Subject: staging: comedi: das16m1: check for subdev_8255_init() failure
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=4b3fb0ff745582e2381945dc56f8f1b3e4a2c9c3;p=deliverable%2Flinux.git

staging: comedi: das16m1: check for subdev_8255_init() failure

Make sure to check if subdev_8255_init() fails and propogate the
error code.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/das16m1.c b/drivers/staging/comedi/drivers/das16m1.c
index 02f52eb83d38..d5f26c99ca4b 100644
--- a/drivers/staging/comedi/drivers/das16m1.c
+++ b/drivers/staging/comedi/drivers/das16m1.c
@@ -648,7 +648,9 @@ static int das16m1_attach(struct comedi_device *dev,
 
 	s = &dev->subdevices[3];
 	/* 8255 */
-	subdev_8255_init(dev, s, NULL, devpriv->extra_iobase);
+	ret = subdev_8255_init(dev, s, NULL, devpriv->extra_iobase);
+	if (ret)
+		return ret;
 
 	/*  disable upper half of hardware conversion counter so it doesn't mess with us */
 	outb(TOTAL_CLEAR, dev->iobase + DAS16M1_8254_FIRST_CNTRL);