From c5168dad57abbcfa7c5a5916a769e029eba8fa35 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Thu, 18 Apr 2013 14:32:48 -0700 Subject: [PATCH] --- yaml --- r: 364157 b: refs/heads/master c: 4b3fb0ff745582e2381945dc56f8f1b3e4a2c9c3 h: refs/heads/master i: 364155: e97c22437e5c223136b7d4137da49055050976bb v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/das16m1.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index afe17dd8bfb6..820c5db5390d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a0b4bccc40983535f518f87792bcb9a7eb103a79 +refs/heads/master: 4b3fb0ff745582e2381945dc56f8f1b3e4a2c9c3 diff --git a/trunk/drivers/staging/comedi/drivers/das16m1.c b/trunk/drivers/staging/comedi/drivers/das16m1.c index 02f52eb83d38..d5f26c99ca4b 100644 --- a/trunk/drivers/staging/comedi/drivers/das16m1.c +++ b/trunk/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);