]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
staging: comedi: rti800: move the comedi_alloc_subdevices()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 9 Apr 2013 01:16:22 +0000 (18:16 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 9 Apr 2013 23:29:03 +0000 (16:29 -0700)
For aesthetic reasons, move the call to comedi_alloc_subdevices()
so it occurs right before the subdevice init.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/rti800.c

index fdd248e8b5e9870597cb3fe29f309302043e2c20..2bc6e8e581e79681c1313fc95904434b4a96ad96 100644 (file)
@@ -311,10 +311,6 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        inb(dev->iobase + RTI800_ADCHI);
        outb(0, dev->iobase + RTI800_CLRFLAGS);
 
-       ret = comedi_alloc_subdevices(dev, 4);
-       if (ret)
-               return ret;
-
        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
        if (!devpriv)
                return -ENOMEM;
@@ -329,6 +325,10 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        devpriv->dac1_coding = it->options[8];
        devpriv->muxgain_bits = -1;
 
+       ret = comedi_alloc_subdevices(dev, 4);
+       if (ret)
+               return ret;
+
        s = &dev->subdevices[0];
        /* ai subdevice */
        s->type = COMEDI_SUBD_AI;