diff --git a/[refs] b/[refs] index 500663b67116..632d8468d731 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f5de611148c8370cbe50796ca5567ca624b99686 +refs/heads/master: fb4d64e78ceab77cf20f7796f74aa10ebe862032 diff --git a/trunk/lib/devres.c b/trunk/lib/devres.c index 2a668dd7cac7..eb38849aa717 100644 --- a/trunk/lib/devres.c +++ b/trunk/lib/devres.c @@ -274,21 +274,21 @@ int pcim_iomap_regions(struct pci_dev *pdev, u16 mask, const char *name) rc = pci_request_region(pdev, i, name); if (rc) - goto err_region; + goto err_inval; rc = -ENOMEM; if (!pcim_iomap(pdev, i, 0)) - goto err_iomap; + goto err_region; } return 0; - err_iomap: - pcim_iounmap(pdev, iomap[i]); err_region: pci_release_region(pdev, i); err_inval: while (--i >= 0) { + if (!(mask & (1 << i))) + continue; pcim_iounmap(pdev, iomap[i]); pci_release_region(pdev, i); }