Merge commit 'v2.6.39-rc3' into for-2.6.39
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 18 Apr 2011 16:12:14 +0000 (17:12 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 18 Apr 2011 16:12:14 +0000 (17:12 +0100)
1  2 
MAINTAINERS
sound/soc/codecs/sn95031.c
sound/soc/codecs/wm8994.c
sound/soc/mid-x86/sst_platform.c

diff --combined MAINTAINERS
@@@ -5390,7 -5390,7 +5390,7 @@@ F:      drivers/media/video/*7146
  F:    include/media/*7146*
  
  SAMSUNG AUDIO (ASoC) DRIVERS
 -M:    Jassi Brar <jassi.brar@samsung.com>
 +M:    Jassi Brar <jassisinghbrar@gmail.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Supported
  F:    sound/soc/samsung
@@@ -6916,6 -6916,13 +6916,13 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    drivers/platform/x86
  
+ XEN NETWORK BACKEND DRIVER
+ M:    Ian Campbell <ian.campbell@citrix.com>
+ L:    xen-devel@lists.xensource.com (moderated for non-subscribers)
+ L:    netdev@vger.kernel.org
+ S:    Supported
+ F:    drivers/net/xen-netback/*
  XEN PCI SUBSYSTEM
  M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
  L:    xen-devel@lists.xensource.com (moderated for non-subscribers)
@@@ -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>
@@@ -925,7 -927,7 +927,7 @@@ static struct platform_driver sn95031_c
                .owner          = THIS_MODULE,
        },
        .probe          = sn95031_device_probe,
 -      .remove         = sn95031_device_remove,
 +      .remove         = __devexit_p(sn95031_device_remove),
  };
  
  static int __init sn95031_init(void)
@@@ -82,18 -82,18 +82,18 @@@ struct wm8994_priv 
  
        int mbc_ena[3];
  
-       /* Platform dependant DRC configuration */
+       /* Platform dependent DRC configuration */
        const char **drc_texts;
        int drc_cfg[WM8994_NUM_DRC];
        struct soc_enum drc_enum;
  
-       /* Platform dependant ReTune mobile configuration */
+       /* Platform dependent ReTune mobile configuration */
        int num_retune_mobile_texts;
        const char **retune_mobile_texts;
        int retune_mobile_cfg[WM8994_NUM_EQ];
        struct soc_enum retune_mobile_enum;
  
-       /* Platform dependant MBC configuration */
+       /* Platform dependent MBC configuration */
        int mbc_cfg;
        const char **mbc_texts;
        struct soc_enum mbc_enum;
@@@ -3261,36 -3261,20 +3261,36 @@@ static int wm8994_codec_probe(struct sn
        wm8994_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
  
        /* Latch volume updates (right only; we always do left then right). */
 +      snd_soc_update_bits(codec, WM8994_AIF1_DAC1_LEFT_VOLUME,
 +                          WM8994_AIF1DAC1_VU, WM8994_AIF1DAC1_VU);
        snd_soc_update_bits(codec, WM8994_AIF1_DAC1_RIGHT_VOLUME,
                            WM8994_AIF1DAC1_VU, WM8994_AIF1DAC1_VU);
 +      snd_soc_update_bits(codec, WM8994_AIF1_DAC2_LEFT_VOLUME,
 +                          WM8994_AIF1DAC2_VU, WM8994_AIF1DAC2_VU);
        snd_soc_update_bits(codec, WM8994_AIF1_DAC2_RIGHT_VOLUME,
                            WM8994_AIF1DAC2_VU, WM8994_AIF1DAC2_VU);
 +      snd_soc_update_bits(codec, WM8994_AIF2_DAC_LEFT_VOLUME,
 +                          WM8994_AIF2DAC_VU, WM8994_AIF2DAC_VU);
        snd_soc_update_bits(codec, WM8994_AIF2_DAC_RIGHT_VOLUME,
                            WM8994_AIF2DAC_VU, WM8994_AIF2DAC_VU);
 +      snd_soc_update_bits(codec, WM8994_AIF1_ADC1_LEFT_VOLUME,
 +                          WM8994_AIF1ADC1_VU, WM8994_AIF1ADC1_VU);
        snd_soc_update_bits(codec, WM8994_AIF1_ADC1_RIGHT_VOLUME,
                            WM8994_AIF1ADC1_VU, WM8994_AIF1ADC1_VU);
 +      snd_soc_update_bits(codec, WM8994_AIF1_ADC2_LEFT_VOLUME,
 +                          WM8994_AIF1ADC2_VU, WM8994_AIF1ADC2_VU);
        snd_soc_update_bits(codec, WM8994_AIF1_ADC2_RIGHT_VOLUME,
                            WM8994_AIF1ADC2_VU, WM8994_AIF1ADC2_VU);
 +      snd_soc_update_bits(codec, WM8994_AIF2_ADC_LEFT_VOLUME,
 +                          WM8994_AIF2ADC_VU, WM8994_AIF1ADC2_VU);
        snd_soc_update_bits(codec, WM8994_AIF2_ADC_RIGHT_VOLUME,
                            WM8994_AIF2ADC_VU, WM8994_AIF1ADC2_VU);
 +      snd_soc_update_bits(codec, WM8994_DAC1_LEFT_VOLUME,
 +                          WM8994_DAC1_VU, WM8994_DAC1_VU);
        snd_soc_update_bits(codec, WM8994_DAC1_RIGHT_VOLUME,
                            WM8994_DAC1_VU, WM8994_DAC1_VU);
 +      snd_soc_update_bits(codec, WM8994_DAC2_LEFT_VOLUME,
 +                          WM8994_DAC2_VU, WM8994_DAC2_VU);
        snd_soc_update_bits(codec, WM8994_DAC2_RIGHT_VOLUME,
                            WM8994_DAC2_VU, WM8994_DAC2_VU);
  
@@@ -116,20 -116,18 +116,20 @@@ struct snd_soc_dai_driver sst_platform_
  static inline void sst_set_stream_status(struct sst_runtime_stream *stream,
                                        int state)
  {
 -      spin_lock(&stream->status_lock);
 +      unsigned long flags;
 +      spin_lock_irqsave(&stream->status_lock, flags);
        stream->stream_status = state;
 -      spin_unlock(&stream->status_lock);
 +      spin_unlock_irqrestore(&stream->status_lock, flags);
  }
  
  static inline int sst_get_stream_status(struct sst_runtime_stream *stream)
  {
        int state;
 +      unsigned long flags;
  
 -      spin_lock(&stream->status_lock);
 +      spin_lock_irqsave(&stream->status_lock, flags);
        state = stream->stream_status;
 -      spin_unlock(&stream->status_lock);
 +      spin_unlock_irqrestore(&stream->status_lock, flags);
        return state;
  }
  
@@@ -442,7 -440,7 +442,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;
  }
  
@@@ -465,7 -463,7 +465,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);