diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-04 11:46:38 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-04 11:46:38 -0700 |
| commit | 4d480efacee65eba9b6301dd02d679458d5ce447 (patch) | |
| tree | 5876cd6337e254266b4276ee46fd664abb6b38d1 /drivers/staging/comedi/drivers/amplc_pc263.c | |
| parent | 9ac6eb40510bf9e6e82435f78f5c1cb92ee3f97a (diff) | |
| parent | 4a7a4f95a5e15648f24a971b36b82adc36d2cb6b (diff) | |
Merge branch 'staging-linus' into staging-next
This gets the 6 staging comedi patches that are needed for further
patches that Ian sent.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/amplc_pc263.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/amplc_pc263.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/staging/comedi/drivers/amplc_pc263.c b/drivers/staging/comedi/drivers/amplc_pc263.c index 148c9d3acf64..017e33ea8b7c 100644 --- a/drivers/staging/comedi/drivers/amplc_pc263.c +++ b/drivers/staging/comedi/drivers/amplc_pc263.c @@ -309,6 +309,13 @@ static int __devinit pc263_attach_pci(struct comedi_device *dev, dev_err(dev->class_dev, "BUG! cannot determine board type!\n"); return -EINVAL; } + /* + * Need to 'get' the PCI device to match the 'put' in pc263_detach(). + * TODO: Remove the pci_dev_get() and matching pci_dev_put() once + * support for manual attachment of PCI devices via pc263_attach() + * has been removed. + */ + pci_dev_get(pci_dev); return pc263_pci_common_attach(dev, pci_dev); } |