aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2008-11-19 16:57:34 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-06 16:52:25 -0500
commit5604ec6fb65ba388b698d8490f797267470b8b23 (patch)
tree3780c2282f62b600cf80117103fa9217a38b12ac /drivers
parentd72187b7cd4bac8eb9f87cabbb8d537145dc4bad (diff)
Staging: comedi: comedi_pci.h: remove unneeded wrapper
just call pci_disable_device() directly in comedi_pci_enable() as no wrapper is needed now that we are in the kernel tree. Cc: David Schleef <ds@schleef.org> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/comedi/drivers/comedi_pci.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/comedi_pci.h b/drivers/staging/comedi/drivers/comedi_pci.h
index 0f32be8ff969..5475941dadc7 100644
--- a/drivers/staging/comedi/drivers/comedi_pci.h
+++ b/drivers/staging/comedi/drivers/comedi_pci.h
@@ -63,7 +63,7 @@ static inline int comedi_pci_enable(struct pci_dev *pdev, const char *res_name)
63 63
64 rc = pci_request_regions(pdev, res_name); 64 rc = pci_request_regions(pdev, res_name);
65 if (rc < 0) 65 if (rc < 0)
66 comedi_pci_disable_no_regions(pdev); 66 pci_disable_device(pdev);
67 67
68 return rc; 68 return rc;
69} 69}