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; }