3 files changed, 54 insertions, 31 deletions

diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c
index 559b0b3c16c3..ab1ad41786d1 100644
--- a/drivers/misc/eeprom/at24.c
+++ b/drivers/misc/eeprom/at24.c
@@ -20,6 +20,7 @@
 #include <linux/log2.h>
 #include <linux/bitops.h>
 #include <linux/jiffies.h>
+#include <linux/of.h>
 #include <linux/i2c.h>
 #include <linux/i2c/at24.h>
 
@@ -457,6 +458,27 @@ static ssize_t at24_macc_write(struct memory_accessor *macc, const char *buf,
 
 /*-------------------------------------------------------------------------*/
 
+#ifdef CONFIG_OF
+static void at24_get_ofdata(struct i2c_client *client,
+                struct at24_platform_data *chip)
+{
+        const __be32 *val;
+        struct device_node *node = client->dev.of_node;
+
+        if (node) {
+                if (of_get_property(node, "read-only", NULL))
+                        chip->flags |= AT24_FLAG_READONLY;
+                val = of_get_property(node, "pagesize", NULL);
+                if (val)
+                        chip->page_size = be32_to_cpup(val);
+        }
+}
+#else
+static void at24_get_ofdata(struct i2c_client *client,
+                struct at24_platform_data *chip)
+{ }
+#endif /* CONFIG_OF */
+
 static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
 {
         struct at24_platform_data chip;
@@ -485,6 +507,9 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
                  */
                 chip.page_size = 1;
 
+                /* update chipdata if OF is present */
+                at24_get_ofdata(client, &chip);
+
                 chip.setup = NULL;
                 chip.context = NULL;
         }
@@ -492,6 +517,11 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
         if (!is_power_of_2(chip.byte_len))
                 dev_warn(&client->dev,
                         "byte_len looks suspicious (no power of 2)!\n");
+        if (!chip.page_size) {
+                dev_err(&client->dev, "page_size must not be 0!\n");
+                err = -EINVAL;
+                goto err_out;
+        }
         if (!is_power_of_2(chip.page_size))
                 dev_warn(&client->dev,
                         "page_size looks suspicious (no power of 2)!\n");
@@ -597,19 +627,15 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
 
         i2c_set_clientdata(client, at24);
 
-        dev_info(&client->dev, "%zu byte %s EEPROM %s\n",
+        dev_info(&client->dev, "%zu byte %s EEPROM, %s, %u bytes/write\n",
                 at24->bin.size, client->name,
-                writable ? "(writable)" : "(read-only)");
+                writable ? "writable" : "read-only", at24->write_max);
         if (use_smbus == I2C_SMBUS_WORD_DATA ||
             use_smbus == I2C_SMBUS_BYTE_DATA) {
                 dev_notice(&client->dev, "Falling back to %s reads, "
                            "performance will suffer\n", use_smbus ==
                            I2C_SMBUS_WORD_DATA ? "word" : "byte");
         }
-        dev_dbg(&client->dev,
-                "page_size %d, num_addresses %d, write_max %d, use_smbus %d\n",
-                chip.page_size, num_addresses,
-                at24->write_max, use_smbus);
 
         /* export data to kernel code */
         if (chip.setup)
@@ -660,6 +686,11 @@ static struct i2c_driver at24_driver = {
 
 static int __init at24_init(void)
 {
+        if (!io_limit) {
+                pr_err("at24: io_limit must not be 0!\n");
+                return -EINVAL;
+        }
+
         io_limit = rounddown_pow_of_two(io_limit);
         return i2c_add_driver(&at24_driver);
 }
diff --git a/drivers/misc/ioc4.c b/drivers/misc/ioc4.c
index 193206602d88..668d41e594a9 100644
--- a/drivers/misc/ioc4.c
+++ b/drivers/misc/ioc4.c
@@ -273,13 +273,11 @@ ioc4_variant(struct ioc4_driver_data *idd)
 static void __devinit
 ioc4_load_modules(struct work_struct *work)
 {
-        /* arg just has to be freed */
-
         request_module("sgiioc4");
-
-        kfree(work);
 }
 
+static DECLARE_WORK(ioc4_load_modules_work, ioc4_load_modules);
+
 /* Adds a new instance of an IOC4 card */
 static int __devinit
 ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
@@ -396,21 +394,12 @@ ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
          * PCI device.
          */
         if (idd->idd_variant != IOC4_VARIANT_PCI_RT) {
-                struct work_struct *work;
-                work = kzalloc(sizeof(struct work_struct), GFP_KERNEL);
-                if (!work) {
-                        printk(KERN_WARNING
-                               "%s: IOC4 unable to allocate memory for "
-                               "load of sub-modules.\n", __func__);
-                } else {
-                        /* Request the module from a work procedure as the
-                         * modprobe goes out to a userland helper and that
-                         * will hang if done directly from ioc4_probe().
-                         */
-                        printk(KERN_INFO "IOC4 loading sgiioc4 submodule\n");
-                        INIT_WORK(work, ioc4_load_modules);
-                        schedule_work(work);
-                }
+                /* Request the module from a work procedure as the modprobe
+                 * goes out to a userland helper and that will hang if done
+                 * directly from ioc4_probe().
+                 */
+                printk(KERN_INFO "IOC4 loading sgiioc4 submodule\n");
+                schedule_work(&ioc4_load_modules_work);
         }
 
         return 0;
@@ -498,7 +487,7 @@ static void __exit
 ioc4_exit(void)
 {
         /* Ensure ioc4_load_modules() has completed before exiting */
-        flush_scheduled_work();
+        flush_work_sync(&ioc4_load_modules_work);
         pci_unregister_driver(&ioc4_driver);
 }
 
diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c
index 2a1e804a71aa..4d2ea8e80140 100644
--- a/drivers/misc/vmw_balloon.c
+++ b/drivers/misc/vmw_balloon.c
@@ -45,7 +45,7 @@
 
 MODULE_AUTHOR("VMware, Inc.");
 MODULE_DESCRIPTION("VMware Memory Control (Balloon) Driver");
-MODULE_VERSION("1.2.1.1-k");
+MODULE_VERSION("1.2.1.2-k");
 MODULE_ALIAS("dmi:*:svnVMware*:*");
 MODULE_ALIAS("vmware_vmmemctl");
 MODULE_LICENSE("GPL");
@@ -315,7 +315,8 @@ static bool vmballoon_send_get_target(struct vmballoon *b, u32 *new_target)
  * fear that guest will need it. Host may reject some pages, we need to
  * check the return value and maybe submit a different page.
  */
-static bool vmballoon_send_lock_page(struct vmballoon *b, unsigned long pfn)
+static bool vmballoon_send_lock_page(struct vmballoon *b, unsigned long pfn,
+                                     unsigned int *hv_status)
 {
         unsigned long status, dummy;
         u32 pfn32;
@@ -326,7 +327,7 @@ static bool vmballoon_send_lock_page(struct vmballoon *b, unsigned long pfn)
 
         STATS_INC(b->stats.lock);
 
-        status = VMWARE_BALLOON_CMD(LOCK, pfn, dummy);
+        *hv_status = status = VMWARE_BALLOON_CMD(LOCK, pfn, dummy);
         if (vmballoon_check_status(b, status))
                 return true;
 
@@ -410,6 +411,7 @@ static int vmballoon_reserve_page(struct vmballoon *b, bool can_sleep)
 {
         struct page *page;
         gfp_t flags;
+        unsigned int hv_status;
         bool locked = false;
 
         do {
@@ -429,11 +431,12 @@ static int vmballoon_reserve_page(struct vmballoon *b, bool can_sleep)
                 }
 
                 /* inform monitor */
-                locked = vmballoon_send_lock_page(b, page_to_pfn(page));
+                locked = vmballoon_send_lock_page(b, page_to_pfn(page), &hv_status);
                 if (!locked) {
                         STATS_INC(b->stats.refused_alloc);
 
-                        if (b->reset_required) {
+                        if (hv_status == VMW_BALLOON_ERROR_RESET ||
+                            hv_status == VMW_BALLOON_ERROR_PPN_NOTNEEDED) {
                                 __free_page(page);
                                 return -EIO;
                         }