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

10 files changed, 19 insertions, 19 deletions

diff --git a/drivers/staging/intel_sst/TODO b/drivers/staging/intel_sst/TODO
index a24e5ed5689..c733d701109 100644
--- a/drivers/staging/intel_sst/TODO
+++ b/drivers/staging/intel_sst/TODO
@@ -1,7 +1,7 @@
 TODO
 ----
 
-Get the memrar driver cleaned up and upstream (dependancy blocking SST)
+Get the memrar driver cleaned up and upstream (dependency blocking SST)
 Replace long/short press with two virtual buttons
 Review the printks and kill off any left over ST_ERR: messages
 Review the misc device ioctls for 32/64bit safety and sanity
diff --git a/drivers/staging/intel_sst/intel_sst.c b/drivers/staging/intel_sst/intel_sst.c
index ce4a9f79ccd..81c24d19eb9 100644
--- a/drivers/staging/intel_sst/intel_sst.c
+++ b/drivers/staging/intel_sst/intel_sst.c
@@ -263,7 +263,7 @@ static int __devinit intel_sst_probe(struct pci_dev *pci,
         /* Init the device */
         ret = pci_enable_device(pci);
         if (ret) {
-                pr_err("device cant be enabled\n");
+                pr_err("device can't be enabled\n");
                 goto do_free_mem;
         }
         sst_drv_ctx->pci = pci_dev_get(pci);
@@ -453,7 +453,7 @@ int intel_sst_resume(struct pci_dev *pci)
         pci_restore_state(pci);
         ret = pci_enable_device(pci);
         if (ret)
-                pr_err("device cant be enabled\n");
+                pr_err("device can't be enabled\n");
 
         mutex_lock(&sst_drv_ctx->sst_lock);
         sst_drv_ctx->sst_state = SST_UN_INIT;
diff --git a/drivers/staging/intel_sst/intel_sst_app_interface.c b/drivers/staging/intel_sst/intel_sst_app_interface.c
index a367991d560..1d0621260ea 100644
--- a/drivers/staging/intel_sst/intel_sst_app_interface.c
+++ b/drivers/staging/intel_sst/intel_sst_app_interface.c
@@ -236,7 +236,7 @@ int intel_sst_mmap(struct file *file_ptr, struct vm_area_struct *vma)
         if (!sst_drv_ctx->mmap_mem)
                 return -EIO;
 
-        /* round it up to the page bondary  */
+        /* round it up to the page boundary  */
         /*mem_area = (void *)((((unsigned long)sst_drv_ctx->mmap_mem)
                                 + PAGE_SIZE - 1) & PAGE_MASK);*/
         mem_area = (void *) PAGE_ALIGN((unsigned int) sst_drv_ctx->mmap_mem);
@@ -871,7 +871,7 @@ int sst_send_algo_ipc(struct ipc_post **msg)
 }
 
 /**
- * intel_sst_ioctl_dsp - recieves the device ioctl's
+ * intel_sst_ioctl_dsp - receives the device ioctl's
  *
  * @cmd:Ioctl cmd
  * @arg:data
@@ -1067,7 +1067,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
                         retval = -EFAULT;
                         break;
                 }
-                pr_debug("SET_VOLUME recieved for %d!\n",
+                pr_debug("SET_VOLUME received for %d!\n",
                                 set_vol.stream_id);
                 if (minor == STREAM_MODULE && set_vol.stream_id == 0) {
                         pr_debug("invalid operation!\n");
@@ -1085,7 +1085,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
                         retval = -EFAULT;
                         break;
                 }
-                pr_debug("IOCTL_GET_VOLUME recieved for stream = %d!\n",
+                pr_debug("IOCTL_GET_VOLUME received for stream = %d!\n",
                                 get_vol.stream_id);
                 if (minor == STREAM_MODULE && get_vol.stream_id == 0) {
                         pr_debug("invalid operation!\n");
@@ -1117,7 +1117,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
                         retval = -EFAULT;
                         break;
                 }
-                pr_debug("SNDRV_SST_SET_VOLUME recieved for %d!\n",
+                pr_debug("SNDRV_SST_SET_VOLUME received for %d!\n",
                         set_mute.stream_id);
                 if (minor == STREAM_MODULE && set_mute.stream_id == 0) {
                         retval = -EPERM;
@@ -1153,7 +1153,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
         case _IOC_NR(SNDRV_SST_MMAP_CAPTURE): {
                 struct snd_sst_mmap_buffs mmap_buf;
 
-                pr_debug("SNDRV_SST_MMAP_PLAY/CAPTURE recieved!\n");
+                pr_debug("SNDRV_SST_MMAP_PLAY/CAPTURE received!\n");
                 if (minor != STREAM_MODULE) {
                         retval = -EBADRQC;
                         break;
@@ -1239,7 +1239,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
         case _IOC_NR(SNDRV_SST_SET_TARGET_DEVICE): {
                 struct snd_sst_target_device target_device;
 
-                pr_debug("SET_TARGET_DEVICE recieved!\n");
+                pr_debug("SET_TARGET_DEVICE received!\n");
                 if (copy_from_user(&target_device, (void __user *)arg,
                                 sizeof(target_device))) {
                         retval = -EFAULT;
@@ -1256,7 +1256,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
         case _IOC_NR(SNDRV_SST_DRIVER_INFO): {
                 struct snd_sst_driver_info info;
 
-                pr_debug("SNDRV_SST_DRIVER_INFO recived\n");
+                pr_debug("SNDRV_SST_DRIVER_INFO received\n");
                 info.version = SST_VERSION_NUM;
                 /* hard coding, shud get sumhow later */
                 info.active_pcm_streams = sst_drv_ctx->stream_cnt -
diff --git a/drivers/staging/intel_sst/intel_sst_drv_interface.c b/drivers/staging/intel_sst/intel_sst_drv_interface.c
index cf10dd60663..971588ce26d 100644
--- a/drivers/staging/intel_sst/intel_sst_drv_interface.c
+++ b/drivers/staging/intel_sst/intel_sst_drv_interface.c
@@ -315,7 +315,7 @@ int sst_open_pcm_stream(struct snd_sst_params *str_param)
         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) {
diff --git a/drivers/staging/intel_sst/intel_sst_dsp.c b/drivers/staging/intel_sst/intel_sst_dsp.c
index 6e5c9152da9..bffe4c6e292 100644
--- a/drivers/staging/intel_sst/intel_sst_dsp.c
+++ b/drivers/staging/intel_sst/intel_sst_dsp.c
@@ -350,7 +350,7 @@ static int sst_download_library(const struct firmware *fw_lib,
 
 }
 
-/* This function is called befoer downloading the codec/postprocessing
+/* This function is called before downloading the codec/postprocessing
 library is set for download to SST DSP*/
 static int sst_validate_library(const struct firmware *fw_lib,
                 struct lib_slot_info *slot,
@@ -405,7 +405,7 @@ exit:
 
 }
 
-/* This function is called when FW requests for a particular libary download
+/* This function is called when FW requests for a particular library download
 This function prepares the library to download*/
 int sst_load_library(struct snd_sst_lib_download *lib, u8 ops)
 {
diff --git a/drivers/staging/intel_sst/intel_sst_fw_ipc.h b/drivers/staging/intel_sst/intel_sst_fw_ipc.h
index 8df313d10d2..0f0c5bbc5f4 100644
--- a/drivers/staging/intel_sst/intel_sst_fw_ipc.h
+++ b/drivers/staging/intel_sst/intel_sst_fw_ipc.h
@@ -111,7 +111,7 @@
 #define IPC_SST_PERIOD_ELAPSED 0x97 /* period elapsed */
 #define IPC_IA_TARGET_DEV_CHNGD 0x98 /* error in processing a stream */
 
-#define IPC_SST_ERROR_EVENT 0x99 /* Buffer over run occured */
+#define IPC_SST_ERROR_EVENT 0x99 /* Buffer over run occurred */
 /* L2S messages */
 #define IPC_SC_DDR_LINK_UP 0xC0
 #define IPC_SC_DDR_LINK_DOWN 0xC1
diff --git a/drivers/staging/intel_sst/intel_sst_stream.c b/drivers/staging/intel_sst/intel_sst_stream.c
index 795e42ab736..dd58be5b197 100644
--- a/drivers/staging/intel_sst/intel_sst_stream.c
+++ b/drivers/staging/intel_sst/intel_sst_stream.c
@@ -98,7 +98,7 @@ static unsigned int get_mrst_stream_id(void)
                 if (sst_drv_ctx->streams[i].status == STREAM_UN_INIT)
                         return i;
         }
-        pr_debug("Didnt find empty stream for mrst\n");
+        pr_debug("Didn't find empty stream for mrst\n");
         return -EBUSY;
 }
 
diff --git a/drivers/staging/intel_sst/intel_sst_stream_encoded.c b/drivers/staging/intel_sst/intel_sst_stream_encoded.c
index 29753c7519a..d5f07b87882 100644
--- a/drivers/staging/intel_sst/intel_sst_stream_encoded.c
+++ b/drivers/staging/intel_sst/intel_sst_stream_encoded.c
@@ -914,7 +914,7 @@ static int sst_prepare_input_buffers_rar(struct stream_info *str_info,
                 (void *) ((unsigned long) rar_buffers.bus_address);
                 pr_debug("RAR buf addr in DnR (input buffer function)0x%lu",
                                  (unsigned long) str_info->decode_ibuf);
-                pr_debug("rar in DnR decode funtion/output b_add rar =0x%lu",
+                pr_debug("rar in DnR decode function/output b_add rar =0x%lu",
                                 (unsigned long) rar_buffers.bus_address);
                 *input_index = i + 1;
                 str_info->decode_isize = dbufs->ibufs->buff_entry[i].size;
diff --git a/drivers/staging/intel_sst/intelmid.c b/drivers/staging/intel_sst/intelmid.c
index 4e4e4a96d86..ebb6d03552c 100644
--- a/drivers/staging/intel_sst/intelmid.c
+++ b/drivers/staging/intel_sst/intelmid.c
@@ -776,7 +776,7 @@ static int __devinit snd_intelmad_sst_register(
                 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");
diff --git a/drivers/staging/intel_sst/intelmid.h b/drivers/staging/intel_sst/intelmid.h
index ca881b790cb..e77da87e1df 100644
--- a/drivers/staging/intel_sst/intelmid.h
+++ b/drivers/staging/intel_sst/intelmid.h
@@ -90,7 +90,7 @@ struct mad_jack_msg_wq {
  * @card_index: sound card index
  * @card_id: sound card id detected
  * @sstdrv_ops: ptr to sst driver ops
- * @pdev: ptr to platfrom device
+ * @pdev: ptr to platform device
  * @irq: interrupt number detected
  * @pmic_status: Device status of sound card
  * @int_base: ptr to MMIO interrupt region