Merge branch 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

[firefly-linux-kernel-4.4.55.git] / drivers / staging / comedi / drivers / cb_pcimdda.c

diff --git a/drivers/staging/comedi/drivers/cb_pcimdda.c b/drivers/staging/comedi/drivers/cb_pcimdda.c
index a4781dbbdd82e6469f6e5a1060ff0a2375b89bbf..19210d89f2b23dcfd850cfee2bb4840382e375aa 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcimdda.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdda.c
@@ -164,11 +164,7 @@ static int cb_pcimdda_auto_attach(struct comedi_device *dev,
 
        s = &dev->subdevices[1];
        /* digital i/o subdevice */
-       ret = subdev_8255_init(dev, s, NULL, PCIMDDA_8255_BASE_REG);
-       if (ret)
-               return ret;
-
-       return 0;
+       return subdev_8255_init(dev, s, NULL, PCIMDDA_8255_BASE_REG);
 }
 
 static struct comedi_driver cb_pcimdda_driver = {