X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=drivers%2Fpnp%2Fresource.c;h=e50ebcffb96240937e3f43f4474857f6cdee8030;hb=22552b286b44b8988e08fb74379507a9b32521b0;hp=087fed18628fd95fc146527883fd4deca67e0a8f;hpb=c1017a4cdb68ae5368fbc9ee42c77f1f5dca8916;p=safe%2Fjmp%2Flinux-2.6

diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index 087fed1..e50ebcf 100644
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -51,7 +51,7 @@ struct pnp_option *pnp_register_independent_option(struct pnp_dev *dev)
 
 	/* this should never happen but if it does we'll try to continue */
 	if (dev->independent)
-		pnp_err("independent resource already registered");
+		dev_err(&dev->dev, "independent resource already registered\n");
 	dev->independent = option;
 	return option;
 }
@@ -367,8 +367,10 @@ int pnp_check_irq(struct pnp_dev *dev, int idx)
 	{
 		struct pci_dev *pci = NULL;
 		for_each_pci_dev(pci) {
-			if (pci->irq == *irq)
+			if (pci->irq == *irq) {
+				pci_dev_put(pci);
 				return 0;
+			}
 		}
 	}
 #endif