Merge tag 'mfd-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next

Pull MFD updates from Samuel Ortiz:
 "For the 3.13 merge window we have a couple of new drivers for the AMS
  AS3722 PMIC and for STMicroelectronics STw481x PMIC.

  Although this is a smaller update than usual, we also have:

   - Device tree support for the max77693 driver

   - linux/of.h inclusion for all DT compatible MFD drivers, to avoid
     build breakage in the future

   - Support for Intel Wildcat Point-LP PCH through the lpc_ich driver

   - A small arizona update for new wm5110 DSP registers and a few fixes

   - A small palmas update as well, including an of_device table
     addition and a few minor fixes

   - Two small mfd-core changes, one including a memory leak fix for
     when mfd_add_device() fails

   - Our usual round of minor cleanups and janitorial fixes"

* tag 'mfd-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next: (63 commits)
  Documentation: mfd: Update s2mps11.txt
  mfd: pm8921: Potential NULL dereference in pm8921_remove()
  mfd: Fix memory leak in mfd_add_devices()
  mfd: Stop setting refcounting pointers in original mfd_cell arrays
  mfd: wm5110: Enable micd clamp functionality
  mfd: lpc_ich: Add Device IDs for Intel Wildcat Point-LP PCH
  mfd: max77693: Fix up bug of wrong interrupt number
  mfd: as3722: Don't export the regmap config
  mfd: twl6040: Remove obsolete cleanup for i2c clientdata
  mfd: tps65910: Remove warning during dt node parsing
  mfd: lpc_sch: Ignore resource conflicts when adding mfd cells
  mfd: ti_am335x_tscadc: Avoid possible deadlock of reg_lock
  mfd: syscon: Return -ENOSYS if CONFIG_MFD_SYSCON is not enabled
  mfd: Add support for ams AS3722 PMIC
  mfd: max77693: Include linux/of.h header
  mfd: tc3589x: Detect the precise version
  mfd: omap-usb: prepare/unprepare clock while enable/disable
  mfd: max77686: Include linux/of.h header
  mfd: max8907: Include linux/of.h header
  mfd: max8997: Include linux/of.h header
  ...

1 files changed, 17 insertions, 12 deletions

diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
index adc8ea36e7c4..267649244737 100644
--- a/drivers/mfd/mfd-core.c
+++ b/drivers/mfd/mfd-core.c
@@ -64,7 +64,8 @@ int mfd_cell_disable(struct platform_device *pdev)
 EXPORT_SYMBOL(mfd_cell_disable);
 
 static int mfd_platform_add_cell(struct platform_device *pdev,
-                                 const struct mfd_cell *cell)
+                                 const struct mfd_cell *cell,
+                                 atomic_t *usage_count)
 {
         if (!cell)
                 return 0;
@@ -73,11 +74,12 @@ static int mfd_platform_add_cell(struct platform_device *pdev,
         if (!pdev->mfd_cell)
                 return -ENOMEM;
 
+        pdev->mfd_cell->usage_count = usage_count;
         return 0;
 }
 
 static int mfd_add_device(struct device *parent, int id,
-                          const struct mfd_cell *cell,
+                          const struct mfd_cell *cell, atomic_t *usage_count,
                           struct resource *mem_base,
                           int irq_base, struct irq_domain *domain)
 {
@@ -123,7 +125,7 @@ static int mfd_add_device(struct device *parent, int id,
                         goto fail_alias;
         }
 
-        ret = mfd_platform_add_cell(pdev, cell);
+        ret = mfd_platform_add_cell(pdev, cell, usage_count);
         if (ret)
                 goto fail_alias;
 
@@ -192,12 +194,12 @@ fail_alloc:
 }
 
 int mfd_add_devices(struct device *parent, int id,
-                    struct mfd_cell *cells, int n_devs,
+                    const struct mfd_cell *cells, int n_devs,
                     struct resource *mem_base,
                     int irq_base, struct irq_domain *domain)
 {
         int i;
-        int ret = 0;
+        int ret;
         atomic_t *cnts;
 
         /* initialize reference counting for all cells */
@@ -207,16 +209,19 @@ int mfd_add_devices(struct device *parent, int id,
 
         for (i = 0; i < n_devs; i++) {
                 atomic_set(&cnts[i], 0);
-                cells[i].usage_count = &cnts[i];
-                ret = mfd_add_device(parent, id, cells + i, mem_base,
+                ret = mfd_add_device(parent, id, cells + i, cnts + i, mem_base,
                                      irq_base, domain);
                 if (ret)
-                        break;
+                        goto fail;
         }
 
-        if (ret)
-                mfd_remove_devices(parent);
+        return 0;
 
+fail:
+        if (i)
+                mfd_remove_devices(parent);
+        else
+                kfree(cnts);
         return ret;
 }
 EXPORT_SYMBOL(mfd_add_devices);
@@ -271,8 +276,8 @@ int mfd_clone_cell(const char *cell, const char **clones, size_t n_clones)
         for (i = 0; i < n_clones; i++) {
                 cell_entry.name = clones[i];
                 /* don't give up if a single call fails; just report error */
-                if (mfd_add_device(pdev->dev.parent, -1, &cell_entry, NULL, 0,
-                                   NULL))
+                if (mfd_add_device(pdev->dev.parent, -1, &cell_entry,
+                                   cell_entry.usage_count, NULL, 0, NULL))
                         dev_err(dev, "failed to create platform device '%s'\n",
                                         clones[i]);
         }