From 88c0c8e25683d7cae54fa281168562c0f66f1ca1 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 18 Jul 2012 19:03:59 -0700 Subject: [PATCH] --- yaml --- r: 318127 b: refs/heads/master c: 27034e8ace5ab5289ee94fb53f9cd5aa821728dd h: refs/heads/master i: 318125: 55a04def03004c4fbaa6b8893318e5476255e73b 318123: 2e7d266c251b64b87b1fa7f7e2c40700c2ea874a 318119: e87ded98758bf33629342fe0db0210c6583f9a27 318111: 7b11dd6918a88992c12b06089a43b812d0fdb2b7 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/me_daq.c | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 4edd04ac5f3c..0d9a6715a168 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 81f9334602a4bec05614cdc228ac5515f03b854e +refs/heads/master: 27034e8ace5ab5289ee94fb53f9cd5aa821728dd diff --git a/trunk/drivers/staging/comedi/drivers/me_daq.c b/trunk/drivers/staging/comedi/drivers/me_daq.c index cd66af936dc5..8c6f8b93b277 100644 --- a/trunk/drivers/staging/comedi/drivers/me_daq.c +++ b/trunk/drivers/staging/comedi/drivers/me_daq.c @@ -233,7 +233,6 @@ static const struct me_board me_boards[] = { /* Private data structure */ struct me_private_data { - struct pci_dev *pci_device; void __iomem *plx_regbase; /* PLX configuration base address */ void __iomem *me_regbase; /* Base address of the Meilhaus card */ unsigned long plx_regbase_size; /* Size of PLX configuration space */ @@ -662,7 +661,7 @@ static int me_attach(struct comedi_device *dev, struct comedi_devconfig *it) pci_device = me_find_pci_dev(dev, it); if (!pci_device) return -EIO; - dev_private->pci_device = pci_device; + comedi_set_hw_dev(dev, &pci_device->dev); board = (struct me_board *)dev->board_ptr; /* Enable PCI device and request PCI regions */ @@ -799,6 +798,8 @@ static int me_attach(struct comedi_device *dev, struct comedi_devconfig *it) static void me_detach(struct comedi_device *dev) { + struct pci_dev *pcidev = comedi_to_pci_dev(dev); + if (dev_private) { if (dev_private->me_regbase) { me_reset(dev); @@ -806,11 +807,11 @@ static void me_detach(struct comedi_device *dev) } if (dev_private->plx_regbase) iounmap(dev_private->plx_regbase); - if (dev_private->pci_device) { - if (dev_private->plx_regbase_size) - comedi_pci_disable(dev_private->pci_device); - pci_dev_put(dev_private->pci_device); - } + } + if (pcidev) { + if (dev_private->plx_regbase_size) + comedi_pci_disable(pcidev); + pci_dev_put(pcidev); } }