ASoC: Merge branch 'for-2.6.39' into for-2.6.40

Fix trivial conflict caused by silly spelling fix patch.

Conflicts:
	sound/soc/codecs/wm8994.c

diff --combined drivers/staging/intel_sst/intel_sst_drv_interface.c
index cf10dd606638c3de21e80951a43938a0c3fc872b,e9c182108243316bca5bc2fdf3b50d3733cdc971..971588ce26d3dd44ae5f726b427898e1676b3023
--- 1/drivers/staging/intel_sst/intel_sst_drv_interface.c
--- 2/drivers/staging/intel_sst/intel_sst_drv_interface.c
+++ b/drivers/staging/intel_sst/intel_sst_drv_interface.c
@@@ -315,7 -315,7 +315,7 @@@ int sst_open_pcm_stream(struct snd_sst_
        pm_runtime_get_sync(&sst_drv_ctx->pci->dev);
  
        if (sst_drv_ctx->sst_state == SST_SUSPENDED) {
-               /* LPE is suspended, resume it before proceding*/
+               /* LPE is suspended, resume it before proceeding*/
                pr_debug("Resuming from Suspended state\n");
                retval = intel_sst_resume(sst_drv_ctx->pci);
                if (retval) {
@@@ -508,6 -508,7 +508,6 @@@ int register_sst_card(struct intel_sst_
                        sst_drv_ctx->pmic_state = SND_MAD_INIT_DONE;
                        sst_drv_ctx->rx_time_slot_status = 0; /*default AMIC*/
                        card->pcm_control = sst_pmic_ops.pcm_control;
 -                      sst_drv_ctx->scard_ops->card_status = SND_CARD_UN_INIT;
                        return 0;
                } else {
                        pr_err("strcmp fail %s\n", card->module_name);

diff --combined drivers/staging/intel_sst/intelmid.c
index 4e4e4a96d863a5c5b0b10fae9fd510e0fa15334f,d207636a7b6d9ffb28dfb22f5745df8ee4235bb5..ebb6d03552c4b5282cb748d6ce429fd5c1f9bf3c
--- 1/drivers/staging/intel_sst/intelmid.c
--- 2/drivers/staging/intel_sst/intelmid.c
+++ b/drivers/staging/intel_sst/intelmid.c
@@@ -32,7 -32,6 +32,7 @@@
  #include <linux/platform_device.h>
  #include <linux/interrupt.h>
  #include <linux/sched.h>
 +#include <linux/firmware.h>
  #include <sound/control.h>
  #include <asm/mrst.h>
  #include <sound/pcm.h>
@@@ -41,8 -40,6 +41,8 @@@
  #include <sound/initval.h>
  #include "intel_sst.h"
  #include "intel_sst_ioctl.h"
 +#include "intel_sst_fw_ipc.h"
 +#include "intel_sst_common.h"
  #include "intelmid_snd_control.h"
  #include "intelmid.h"
  
@@@ -776,7 -773,7 +776,7 @@@ static int __devinit snd_intelmad_sst_r
                if (ret_val)
                        return ret_val;
                sst_card_vendor_id = (vendor_addr.value & (MASK2|MASK1|MASK0));
-               pr_debug("orginal n extrated vendor id = 0x%x %d\n",
+               pr_debug("original n extrated vendor id = 0x%x %d\n",
                                vendor_addr.value, sst_card_vendor_id);
                if (sst_card_vendor_id < 0 || sst_card_vendor_id > 2) {
                        pr_err("vendor card not supported!!\n");
@@@ -805,7 -802,6 +805,7 @@@
                pr_err("sst card registration failed\n");
                return ret_val;
        }
 +      sst_drv_ctx->scard_ops->card_status = SND_CARD_UN_INIT;
  
        sst_card_vendor_id = intelmaddata->sstdrv_ops->vendor_id;
        intelmaddata->pmic_status = PMIC_UNINIT;

diff --combined sound/soc/codecs/sn95031.c
index f70977d7dbe61722a86a8de6478898d4b766ebba,4d9fb279e14673344c305a938959a4c6921f7d6f..84ffdebb8a8b9c937c9ffa1323f4de40f2874e81
--- 1/sound/soc/codecs/sn95031.c
--- 2/sound/soc/codecs/sn95031.c
+++ b/sound/soc/codecs/sn95031.c
@@@ -26,7 -26,9 +26,9 @@@
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
  #include <linux/platform_device.h>
+ #include <linux/delay.h>
  #include <linux/slab.h>
+ 
  #include <asm/intel_scu_ipc.h>
  #include <sound/pcm.h>
  #include <sound/pcm_params.h>
@@@ -825,6 -827,8 +827,6 @@@ EXPORT_SYMBOL_GPL(sn95031_jack_detectio
  /* codec registration */
  static int sn95031_codec_probe(struct snd_soc_codec *codec)
  {
 -      int ret;
 -
        pr_debug("codec_probe called\n");
  
        codec->dapm.bias_level = SND_SOC_BIAS_OFF;
@@@ -875,7 -879,16 +877,7 @@@
        snd_soc_add_controls(codec, sn95031_snd_controls,
                             ARRAY_SIZE(sn95031_snd_controls));
  
 -      ret = snd_soc_dapm_new_controls(&codec->dapm, sn95031_dapm_widgets,
 -                              ARRAY_SIZE(sn95031_dapm_widgets));
 -      if (ret)
 -              pr_err("soc_dapm_new_control failed %d", ret);
 -      ret = snd_soc_dapm_add_routes(&codec->dapm, sn95031_audio_map,
 -                              ARRAY_SIZE(sn95031_audio_map));
 -      if (ret)
 -              pr_err("soc_dapm_add_routes failed %d", ret);
 -
 -      return ret;
 +      return 0;
  }
  
  static int sn95031_codec_remove(struct snd_soc_codec *codec)
@@@ -892,10 -905,6 +894,10 @@@ struct snd_soc_codec_driver sn95031_cod
        .read           = sn95031_read,
        .write          = sn95031_write,
        .set_bias_level = sn95031_set_vaud_bias,
 +      .dapm_widgets   = sn95031_dapm_widgets,
 +      .num_dapm_widgets       = ARRAY_SIZE(sn95031_dapm_widgets),
 +      .dapm_routes    = sn95031_audio_map,
 +      .num_dapm_routes        = ARRAY_SIZE(sn95031_audio_map),
  };
  
  static int __devinit sn95031_device_probe(struct platform_device *pdev)

diff --combined sound/soc/imx/imx-ssi.c
index c331d65587d8245f53cf226d8267020b2c8d2616,ac2ded969253895a0b5df067922e91b1678a12a7..5b13feca753732a6664969308e0794b161936aa8
--- 1/sound/soc/imx/imx-ssi.c
--- 2/sound/soc/imx/imx-ssi.c
+++ b/sound/soc/imx/imx-ssi.c
@@@ -16,7 -16,7 +16,7 @@@
   * sane processor vendors have a FIFO per AC97 slot, the i.MX has only
   * one FIFO which combines all valid receive slots. We cannot even select
   * which slots we want to receive. The WM9712 with which this driver
-  * was developped with always sends GPIO status data in slot 12 which
+  * was developed with always sends GPIO status data in slot 12 which
   * we receive in our (PCM-) data stream. The only chance we have is to
   * manually skip this data in the FIQ handler. With sampling rates different
   * from 48000Hz not every frame has valid receive data, so the ratio
@@@ -667,6 -667,12 +667,6 @@@ static int imx_ssi_probe(struct platfor
        if (res)
                ssi->dma_params_rx.dma = res->start;
  
 -      if ((cpu_is_mx27() || cpu_is_mx21()) &&
 -                      !(ssi->flags & IMX_SSI_USE_AC97) &&
 -                      (ssi->flags & IMX_SSI_DMA)) {
 -              ssi->flags |= IMX_SSI_DMA;
 -      }
 -
        platform_set_drvdata(pdev, ssi);
  
        ret = snd_soc_register_dai(&pdev->dev, dai);

diff --combined sound/soc/mid-x86/sst_platform.c
index d827edb3d544b71af8c2f2028e87560ef0edccee,d567c322a2fb471788d7b8f47345a6b9fd6d5aed..9765fb81a5e3b755a2b9c0c4bf519aca9985dd8f
--- 1/sound/soc/mid-x86/sst_platform.c
--- 2/sound/soc/mid-x86/sst_platform.c
+++ b/sound/soc/mid-x86/sst_platform.c
@@@ -249,13 -249,10 +249,13 @@@ static int sst_platform_open(struct snd
                return -ENOMEM;
        }
        stream->sstdrv_ops->vendor_id = MSIC_VENDOR_ID;
 +      stream->sstdrv_ops->module_name = SST_CARD_NAMES;
        /* registering with SST driver to get access to SST APIs to use */
        ret_val = register_sst_card(stream->sstdrv_ops);
        if (ret_val) {
                pr_err("sst: sst card registration failed\n");
 +              kfree(stream->sstdrv_ops);
 +              kfree(stream);
                return ret_val;
        }
        runtime->private_data = stream;
@@@ -273,7 -270,6 +273,7 @@@ static int sst_platform_close(struct sn
        str_id = stream->stream_info.str_id;
        if (str_id)
                ret_val = stream->sstdrv_ops->pcm_control->close(str_id);
 +      unregister_sst_card(stream->sstdrv_ops);
        kfree(stream->sstdrv_ops);
        kfree(stream);
        return ret_val;
@@@ -446,7 -442,7 +446,7 @@@ static int sst_platform_remove(struct p
  
        snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sst_platform_dai));
        snd_soc_unregister_platform(&pdev->dev);
-       pr_debug("sst_platform_remove sucess\n");
+       pr_debug("sst_platform_remove success\n");
        return 0;
  }
  
@@@ -469,7 -465,7 +469,7 @@@ module_init(sst_soc_platform_init)
  static void __exit sst_soc_platform_exit(void)
  {
        platform_driver_unregister(&sst_platform_driver);
-       pr_debug("sst_soc_platform_exit sucess\n");
+       pr_debug("sst_soc_platform_exit success\n");
  }
  module_exit(sst_soc_platform_exit);
  

diff --combined sound/soc/soc-jack.c
index 6203a72d57af1dafbd866ad7671a830ce869cf50,fc017c0a7b5d332082ace1a212dff7eb268fb7c4..7c17b98d584609c4a9fd78afe5c019a43728db1f
--- 1/sound/soc/soc-jack.c
--- 2/sound/soc/soc-jack.c
+++ b/sound/soc/soc-jack.c
@@@ -325,13 -325,13 +325,13 @@@ int snd_soc_jack_add_gpios(struct snd_s
                                              gpio_handler,
                                              IRQF_TRIGGER_RISING |
                                              IRQF_TRIGGER_FALLING,
 -                                            jack->codec->dev->driver->name,
 +                                            gpios[i].name,
                                              &gpios[i]);
                if (ret)
                        goto err;
  
                if (gpios[i].wake) {
-                       ret = set_irq_wake(gpio_to_irq(gpios[i].gpio), 1);
+                       ret = irq_set_irq_wake(gpio_to_irq(gpios[i].gpio), 1);
                        if (ret != 0)
                                printk(KERN_ERR
                                  "Failed to mark GPIO %d as wake source: %d\n",