From 3f9233c4be68dcefd15b21144e0406bc271a89f9 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Mon, 3 Sep 2012 16:39:41 +0100 Subject: [PATCH] --- yaml --- r: 322675 b: refs/heads/master c: a0234ade63ce2c14841d9d6e802ed735b4ed2829 h: refs/heads/master i: 322673: f50461a3f04132c613a126abfa43b63e8ed74842 322671: 82af0ecfccc1dfa78b90f75b4d61fef3df2617f7 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/amplc_pc263.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f6026026c0c5..c38f4333bb02 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3abcfe0eeda850481143d05bdd206dd2b170d07d +refs/heads/master: a0234ade63ce2c14841d9d6e802ed735b4ed2829 diff --git a/trunk/drivers/staging/comedi/drivers/amplc_pc263.c b/trunk/drivers/staging/comedi/drivers/amplc_pc263.c index 40ec1ffebba6..8191c4e28e0a 100644 --- a/trunk/drivers/staging/comedi/drivers/amplc_pc263.c +++ b/trunk/drivers/staging/comedi/drivers/amplc_pc263.c @@ -298,6 +298,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); }