diff options
| author | David S. Miller <davem@davemloft.net> | 2015-02-18 02:48:51 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-18 02:48:51 (GMT) |
| commit | fece13ca005a5f559147e9424321f4b5e01272b4 (patch) | |
| tree | 54e762e70afb664d14152e6bcf89a48be3fb9c13 /drivers/staging/comedi/drivers/ni_labpc_pci.c | |
| parent | 855e7e7174bade3f2b63077a81eea5aab525dbf6 (diff) | |
| parent | f5af19d10d151c5a2afae3306578f485c244db25 (diff) | |
| download | linux-fece13ca005a5f559147e9424321f4b5e01272b4.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/staging/comedi/drivers/ni_labpc_pci.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_labpc_pci.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/ni_labpc_pci.c b/drivers/staging/comedi/drivers/ni_labpc_pci.c index 3fc4204..0407ff6 100644 --- a/drivers/staging/comedi/drivers/ni_labpc_pci.c +++ b/drivers/staging/comedi/drivers/ni_labpc_pci.c @@ -17,7 +17,7 @@ /* * Driver: ni_labpc_pci * Description: National Instruments Lab-PC PCI-1200 - * Devices: (National Instruments) PCI-1200 [ni_pci-1200] + * Devices: [National Instruments] PCI-1200 (ni_pci-1200) * Author: Frank Mori Hess <fmhess@users.sourceforge.net> * Status: works * @@ -79,7 +79,6 @@ static int labpc_pci_auto_attach(struct comedi_device *dev, { struct pci_dev *pcidev = comedi_to_pci_dev(dev); const struct labpc_boardinfo *board = NULL; - struct labpc_private *devpriv; int ret; if (context < ARRAY_SIZE(labpc_pci_boards)) @@ -101,10 +100,6 @@ static int labpc_pci_auto_attach(struct comedi_device *dev, if (!dev->mmio) return -ENOMEM; - devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv)); - if (!devpriv) - return -ENOMEM; - return labpc_common_attach(dev, pcidev->irq, IRQF_SHARED); } |