Re: [PATCH 2/2] Fixed typo Intel RNG driver for2.6.21-rc7-mm1

[Jan Beulich]

But why do you remove the printk()?

>>> "Tomita, Haruo" <haruo.tomita@xxxxxxxxxxxxx> 26.04.07 08:27 >>>
This patch fixes a typo in mod_init().
fwh_done is performed when Intel fwh is found.

 intel-rng.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- linux-2.6.21-rc7-mm1/drivers/char/hw_random/intel-rng.c~	2007-04-26 13:41:53.000000000 +0900
+++ linux-2.6.21-rc7-mm1/drivers/char/hw_random/intel-rng.c	2007-04-26 13:43:35.000000000 +0900
@@ -264,7 +264,6 @@ static int __init intel_rng_hw_init(void
 	if (mfc != INTEL_FWH_MANUFACTURER_CODE ||
 	    (dvc != INTEL_FWH_DEVICE_CODE_8M &&
 	     dvc != INTEL_FWH_DEVICE_CODE_4M)) {
-		printk(KERN_ERR PFX "FWH not detected\n");
 		return -ENODEV;
 	}
 
@@ -365,7 +364,8 @@ static int __init mod_init(void)
 	pci_dev_put(dev);
 	iounmap(intel_rng_hw->mem);
 	kfree(intel_rng_hw);
-	goto out;
+	if (err)
+		goto out;
 
 fwh_done:
 	err = -ENOMEM;

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/