From 5da45f9b43e6b91ada40b2c168d4527585fe95d2 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 21 Jan 2013 15:17:40 -0700 Subject: [PATCH] --- yaml --- r: 354120 b: refs/heads/master c: 3f8e9e67cb8c0f99b3cb7936d650ad16adedbc34 h: refs/heads/master v: v3 --- [refs] | 2 +- .../drivers/staging/comedi/drivers/addi_apci_2200.c | 13 ++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 0d2b15590d13..128f46a4d736 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 934efe63e8bece28c69d18ea5e3bfd1619fc23b2 +refs/heads/master: 3f8e9e67cb8c0f99b3cb7936d650ad16adedbc34 diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_2200.c b/trunk/drivers/staging/comedi/drivers/addi_apci_2200.c index 99a206aa5ab4..7ea0dc673b5c 100644 --- a/trunk/drivers/staging/comedi/drivers/addi_apci_2200.c +++ b/trunk/drivers/staging/comedi/drivers/addi_apci_2200.c @@ -81,7 +81,6 @@ static int apci2200_auto_attach(struct comedi_device *dev, { struct pci_dev *pcidev = comedi_to_pci_dev(dev); const struct addi_board *this_board; - struct addi_private *devpriv; struct comedi_subdevice *s; int ret, n_subdevices; @@ -91,11 +90,6 @@ static int apci2200_auto_attach(struct comedi_device *dev, dev->board_ptr = this_board; dev->board_name = this_board->pc_DriverName; - devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL); - if (!devpriv) - return -ENOMEM; - dev->private = devpriv; - ret = comedi_pci_enable(pcidev, dev->board_name); if (ret) return ret; @@ -154,12 +148,9 @@ static int apci2200_auto_attach(struct comedi_device *dev, static void apci2200_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) - apci2200_reset(dev); - } + if (dev->iobase) + apci2200_reset(dev); if (dev->subdevices) addi_watchdog_cleanup(&dev->subdevices[4]); if (pcidev) {