Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 354247
b: refs/heads/master
c: abbe079
h: refs/heads/master
i:
  354245: 6000b3e
  354243: 4658dd9
  354239: 0e89c24
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jan 30, 2013
1 parent 673f6bc commit 28b251c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: aaefe848e056474a583b43c13c4891fbda50caa4
refs/heads/master: abbe0796baa03610f3147c786c7c3f20b0050c1d
14 changes: 7 additions & 7 deletions trunk/drivers/staging/comedi/drivers/ni_mio_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 28b251c

Please sign in to comment.