From 28b251cd4e1c360b3957205d315479e1adc2adf5 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Fri, 25 Jan 2013 17:35:02 -0700 Subject: [PATCH] --- yaml --- r: 354247 b: refs/heads/master c: abbe0796baa03610f3147c786c7c3f20b0050c1d h: refs/heads/master i: 354245: 6000b3e898582a76701279059a4e459953119c56 354243: 4658dd9527f3ce0e5795530532faee6de3079d2a 354239: 0e89c249cc27a1da43e82cb1b74881ef701acc17 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/ni_mio_cs.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 5fef5a9eebfa..e82dbc7423bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aaefe848e056474a583b43c13c4891fbda50caa4 +refs/heads/master: abbe0796baa03610f3147c786c7c3f20b0050c1d diff --git a/trunk/drivers/staging/comedi/drivers/ni_mio_cs.c b/trunk/drivers/staging/comedi/drivers/ni_mio_cs.c index 253f735b3b4e..2d28a71511aa 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_mio_cs.c +++ b/trunk/drivers/staging/comedi/drivers/ni_mio_cs.c @@ -230,13 +230,6 @@ static uint16_t mio_cs_win_in(struct comedi_device *dev, int addr) static int ni_getboardtype(struct comedi_device *dev, struct pcmcia_device *link); -static void mio_cs_detach(struct comedi_device *dev) -{ - mio_common_detach(dev); - if (dev->irq) - free_irq(dev->irq, dev); -} - static struct pcmcia_device *cur_dev; static int mio_cs_attach(struct comedi_device *dev, struct comedi_devconfig *it) @@ -324,6 +317,13 @@ static int ni_getboardtype(struct comedi_device *dev, return 0; } +static void mio_cs_detach(struct comedi_device *dev) +{ + mio_common_detach(dev); + if (dev->irq) + free_irq(dev->irq, dev); +} + static struct comedi_driver driver_ni_mio_cs = { .driver_name = "ni_mio_cs", .module = THIS_MODULE,