patch-2.4.2 linux/drivers/mtd/pmc551.c

Next file: linux/drivers/mtd/rpxlite.c
Previous file: linux/drivers/mtd/octagon-5066.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.1/linux/drivers/mtd/pmc551.c linux/drivers/mtd/pmc551.c
@@ -78,7 +78,7 @@
 #include <linux/sched.h>
 #include <linux/init.h>
 #include <linux/ptrace.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/timer.h>
 #include <linux/major.h>
@@ -483,7 +483,7 @@
         pci_write_config_word( dev, PMC551_SDRAM_CMD, 0x00bf );
 
         /*
-         * Wait untill command has gone through
+         * Wait until command has gone through
          * FIXME: register spinning issue
          */
         do {	pci_read_config_word( dev, PMC551_SDRAM_CMD, &cmd );
@@ -709,7 +709,7 @@
                        PCI_Device->irq);
 
                 /*
-                 * The PMC551 device acts VERY wierd if you don't init it
+                 * The PMC551 device acts VERY weird if you don't init it
                  * first.  i.e. it will not correctly report devsel.  If for
                  * some reason the sdram is in a wrote-protected state the
                  * device will DEVSEL when it is written to causing problems
@@ -804,6 +804,7 @@
 
                 if (add_mtd_device(mtd)) {
                         printk(KERN_NOTICE "pmc551: Failed to register new device\n");
+			iounmap(priv->start);
                         kfree(mtd->priv);
                         kfree(mtd);
                         break;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)