From b1a203a90dc0673c25bff6e64efbf3eb7e3809dc Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 13 Nov 2012 13:42:38 -0700 Subject: [PATCH] --- yaml --- r: 337869 b: refs/heads/master c: 4bcf9593b46c1fe3b952ae541dec45a810d0debd h: refs/heads/master i: 337867: 52f98adac4bb05bab8fb685cfb498a184ba667c0 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/addi_apci_1516.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index c09e6e2fc658..40fdb6defd51 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d330b1da10a2bd0f71c2aa7f9e209b8d06d45901 +refs/heads/master: 4bcf9593b46c1fe3b952ae541dec45a810d0debd diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_1516.c b/trunk/drivers/staging/comedi/drivers/addi_apci_1516.c index dabf44c7360f..941ed608cc6a 100644 --- a/trunk/drivers/staging/comedi/drivers/addi_apci_1516.c +++ b/trunk/drivers/staging/comedi/drivers/addi_apci_1516.c @@ -180,14 +180,9 @@ static int __devinit apci1516_auto_attach(struct comedi_device *dev, static void apci1516_detach(struct comedi_device *dev) { struct pci_dev *pcidev = comedi_to_pci_dev(dev); - struct addi_private *devpriv = dev->private; - if (devpriv) { - if (dev->iobase) - apci1516_reset(dev); - if (devpriv->dw_AiBase) - iounmap(devpriv->dw_AiBase); - } + if (dev->iobase) + apci1516_reset(dev); if (pcidev) { if (dev->iobase) comedi_pci_disable(pcidev);