4 files changed, 16 insertions, 11 deletions

diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c
index 33b669e6f977..6996476669f1 100644
--- a/drivers/firmware/edd.c
+++ b/drivers/firmware/edd.c
@@ -115,7 +115,7 @@ edd_attr_show(struct kobject * kobj, struct attribute *attr, char *buf)
 {
         struct edd_device *dev = to_edd_device(kobj);
         struct edd_attribute *edd_attr = to_edd_attr(attr);
-        ssize_t ret = 0;
+        ssize_t ret = -EIO;
 
         if (edd_attr->show)
                 ret = edd_attr->show(dev, buf);
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index 0287ff65963b..33b17c6a46fb 100644
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -352,7 +352,7 @@ static ssize_t efivar_attr_show(struct kobject *kobj, struct attribute *attr,
 {
         struct efivar_entry *var = to_efivar_entry(kobj);
         struct efivar_attribute *efivar_attr = to_efivar_attr(attr);
-        ssize_t ret = 0;
+        ssize_t ret = -EIO;
 
         if (!capable(CAP_SYS_ADMIN))
                 return -EACCES;
@@ -368,7 +368,7 @@ static ssize_t efivar_attr_store(struct kobject *kobj, struct attribute *attr,
 {
         struct efivar_entry *var = to_efivar_entry(kobj);
         struct efivar_attribute *efivar_attr = to_efivar_attr(attr);
-        ssize_t ret = 0;
+        ssize_t ret = -EIO;
 
         if (!capable(CAP_SYS_ADMIN))
                 return -EACCES;
@@ -618,8 +618,8 @@ efivar_create_sysfs_entry(unsigned long variable_name_size,
         new_efivar = kmalloc(sizeof(struct efivar_entry), GFP_KERNEL);
 
         if (!short_name || !new_efivar)  {
-                if (short_name)        kfree(short_name);
-                if (new_efivar)        kfree(new_efivar);
+                kfree(short_name);
+                kfree(new_efivar);
                 return 1;
         }
         memset(short_name, 0, short_name_size+1);
@@ -644,7 +644,8 @@ efivar_create_sysfs_entry(unsigned long variable_name_size,
         kobj_set_kset_s(new_efivar, vars_subsys);
         kobject_register(&new_efivar->kobj);
 
-        kfree(short_name); short_name = NULL;
+        kfree(short_name);
+        short_name = NULL;
 
         spin_lock(&efivars_lock);
         list_add(&new_efivar->list, &efivar_list);
diff --git a/drivers/firmware/pcdp.c b/drivers/firmware/pcdp.c
index 6d5df6c2efa2..839b44a7e08b 100644
--- a/drivers/firmware/pcdp.c
+++ b/drivers/firmware/pcdp.c
@@ -11,6 +11,7 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/config.h>
 #include <linux/acpi.h>
 #include <linux/console.h>
 #include <linux/efi.h>
@@ -22,12 +23,15 @@ setup_serial_console(struct pcdp_uart *uart)
 {
 #ifdef CONFIG_SERIAL_8250_CONSOLE
         int mmio;
-        static char options[64];
+        static char options[64], *p = options;
 
         mmio = (uart->addr.address_space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY);
-        snprintf(options, sizeof(options), "console=uart,%s,0x%lx,%lun%d",
-                mmio ? "mmio" : "io", uart->addr.address, uart->baud,
-                uart->bits ? uart->bits : 8);
+        p += sprintf(p, "console=uart,%s,0x%lx",
+                mmio ? "mmio" : "io", uart->addr.address);
+        if (uart->baud)
+                p += sprintf(p, ",%lu", uart->baud);
+        if (uart->bits)
+                p += sprintf(p, "n%d", uart->bits);
 
         return early_serial_console_init(options);
 #else
diff --git a/drivers/firmware/pcdp.h b/drivers/firmware/pcdp.h
index 863bb6f768c3..1dc7c88b7b4d 100644
--- a/drivers/firmware/pcdp.h
+++ b/drivers/firmware/pcdp.h
@@ -2,7 +2,7 @@
  * Definitions for PCDP-defined console devices
  *
  * v1.0a: http://www.dig64.org/specifications/DIG64_HCDPv10a_01.pdf
- * v2.0:  http://www.dig64.org/specifications/DIG64_HCDPv20_042804.pdf
+ * v2.0:  http://www.dig64.org/specifications/DIG64_PCDPv20.pdf
  *
  * (c) Copyright 2002, 2004 Hewlett-Packard Development Company, L.P.
  *      Khalid Aziz <khalid.aziz@hp.com>