Merge branches 'release', 'acpi_pm_device_sleep_state' and 'battery' into release

[linux-2.6] / drivers / pnp / pnpbios / proc.c

diff --git a/drivers/pnp/pnpbios/proc.c b/drivers/pnp/pnpbios/proc.c
index b7e1d23e8a4e9aa43bc7d12e47ba7940986da409..bb19bc957bad9274457930b8b75b7753e62a7ac4 100644 (file)
--- a/drivers/pnp/pnpbios/proc.c
+++ b/drivers/pnp/pnpbios/proc.c
@@ -18,9 +18,6 @@
  * The other files are human-readable.
  */
 
-//#include <pcmcia/config.h>
-//#include <pcmcia/k_compat.h>
-
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
@@ -97,8 +94,9 @@ static int proc_read_escd(char *buf, char **start, off_t pos,
 
        /* sanity check */
        if (escd_size > MAX_SANE_ESCD_SIZE) {
-               printk(KERN_ERR
-                      "PnPBIOS: proc_read_escd: ESCD size reported by BIOS read_escd call is too great\n");
+               printk(KERN_ERR "PnPBIOS: proc_read_escd: ESCD size reported by"
+                               " BIOS read_escd call is too great\n");
+               kfree(tmpbuf);
                return -EFBIG;
        }
 
@@ -215,7 +213,7 @@ static int proc_write_node(struct file *file, const char __user * buf,
                goto out;
        }
        ret = count;
-      out:
+out:
        kfree(node);
        return ret;
 }
@@ -297,6 +295,4 @@ void __exit pnpbios_proc_exit(void)
        remove_proc_entry("devices", proc_pnp);
        remove_proc_entry("boot", proc_pnp);
        remove_proc_entry("pnp", proc_bus);
-
-       return;
 }