Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
  mfd: Fix for the TWL4030 PM sleep/wakeup sequence
  mfd: Fix asic3 build error
  mfd: Fixed gpio polarity of omap-usb gpio USB-phy reset

3 files changed, 7 insertions, 6 deletions

diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
index d4a851c6b5bf..0b4d5b23bec9 100644
--- a/drivers/mfd/asic3.c
+++ b/drivers/mfd/asic3.c
@@ -144,7 +144,7 @@ static void asic3_irq_demux(unsigned int irq, struct irq_desc *desc)
         int iter, i;
         unsigned long flags;
 
-        data->chip->irq_ack(irq_data);
+        data->chip->irq_ack(data);
 
         for (iter = 0 ; iter < MAX_ASIC_ISR_LOOPS; iter++) {
                 u32 status;
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index 2e165117457b..3ab9ffa00aad 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -717,14 +717,14 @@ static int usbhs_enable(struct device *dev)
                         gpio_request(pdata->ehci_data->reset_gpio_port[0],
                                                 "USB1 PHY reset");
                         gpio_direction_output
-                                (pdata->ehci_data->reset_gpio_port[0], 1);
+                                (pdata->ehci_data->reset_gpio_port[0], 0);
                 }
 
                 if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[1])) {
                         gpio_request(pdata->ehci_data->reset_gpio_port[1],
                                                 "USB2 PHY reset");
                         gpio_direction_output
-                                (pdata->ehci_data->reset_gpio_port[1], 1);
+                                (pdata->ehci_data->reset_gpio_port[1], 0);
                 }
 
                 /* Hold the PHY in RESET for enough time till DIR is high */
@@ -904,11 +904,11 @@ static int usbhs_enable(struct device *dev)
 
                 if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[0]))
                         gpio_set_value
-                                (pdata->ehci_data->reset_gpio_port[0], 0);
+                                (pdata->ehci_data->reset_gpio_port[0], 1);
 
                 if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[1]))
                         gpio_set_value
-                                (pdata->ehci_data->reset_gpio_port[1], 0);
+                                (pdata->ehci_data->reset_gpio_port[1], 1);
         }
 
 end_count:
diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
index 16422de0823a..2c0d4d16491a 100644
--- a/drivers/mfd/twl4030-power.c
+++ b/drivers/mfd/twl4030-power.c
@@ -447,12 +447,13 @@ static int __init load_twl4030_script(struct twl4030_script *tscript,
                 if (err)
                         goto out;
         }
-        if (tscript->flags & TWL4030_SLEEP_SCRIPT)
+        if (tscript->flags & TWL4030_SLEEP_SCRIPT) {
                 if (order)
                         pr_warning("TWL4030: Bad order of scripts (sleep "\
                                         "script before wakeup) Leads to boot"\
                                         "failure on some boards\n");
                 err = twl4030_config_sleep_sequence(address);
+        }
 out:
         return err;
 }