From 0675d89074a220e09430af474978432d08e0d4e9 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 8 Apr 2013 18:16:22 -0700 Subject: [PATCH] --- yaml --- r: 363998 b: refs/heads/master c: 849d1ea4ae28e57557ad8901837d36aa2a760b5e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/rti800.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 38103123e951..ee69e2104c96 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c5eb6eadec53012ddd820dbab686665b02313dca +refs/heads/master: 849d1ea4ae28e57557ad8901837d36aa2a760b5e diff --git a/trunk/drivers/staging/comedi/drivers/rti800.c b/trunk/drivers/staging/comedi/drivers/rti800.c index fdd248e8b5e9..2bc6e8e581e7 100644 --- a/trunk/drivers/staging/comedi/drivers/rti800.c +++ b/trunk/drivers/staging/comedi/drivers/rti800.c @@ -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;