From 39eaf4bfed3370256f3b10f77bbe249bc90318e7 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 19 Nov 2008 13:57:34 -0800 Subject: [PATCH] --- yaml --- r: 126725 b: refs/heads/master c: 5604ec6fb65ba388b698d8490f797267470b8b23 h: refs/heads/master i: 126723: eadc112a225c491b353c75ee78b461eabb3272ab v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/comedi_pci.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a1ac75b790f9..abe4456a8051 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d72187b7cd4bac8eb9f87cabbb8d537145dc4bad +refs/heads/master: 5604ec6fb65ba388b698d8490f797267470b8b23 diff --git a/trunk/drivers/staging/comedi/drivers/comedi_pci.h b/trunk/drivers/staging/comedi/drivers/comedi_pci.h index 0f32be8ff969..5475941dadc7 100644 --- a/trunk/drivers/staging/comedi/drivers/comedi_pci.h +++ b/trunk/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) rc = pci_request_regions(pdev, res_name); if (rc < 0) - comedi_pci_disable_no_regions(pdev); + pci_disable_device(pdev); return rc; }