From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 13 Dec 2010 08:28:43 +0000 (+0100)
Subject: Merge branch 'topic/workq-update' into topic/asoc
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=20aeeb356ba2e8daa99b5942c528ae2b3ea28433;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

Merge branch 'topic/workq-update' into topic/asoc

Conflicts:
	sound/soc/codecs/wm8350.c
	sound/soc/codecs/wm8753.c
	sound/soc/sh/fsi.c
	sound/soc/soc-core.c
---

20aeeb356ba2e8daa99b5942c528ae2b3ea28433
diff --cc sound/soc/sh/fsi.c
index 19a2f99be60,4c2404b1b86..97c5394aa7d
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@@ -142,6 -131,10 +142,8 @@@ struct fsi_priv 
  
  	struct fsi_stream playback;
  	struct fsi_stream capture;
+ 
+ 	long rate;
 -
 -	u32 mst_ctrl;
  };
  
  struct fsi_core {
diff --cc sound/soc/soc-core.c
index a14a0507bbd,b54ea9a0a1d..68edc693a8a
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@@ -1046,8 -997,8 +1027,8 @@@ static int soc_suspend(struct device *d
  
  	/* close any waiting streams and save state */
  	for (i = 0; i < card->num_rtd; i++) {
- 		run_delayed_work(&card->rtd[i].delayed_work);
+ 		flush_delayed_work_sync(&card->rtd[i].delayed_work);
 -		card->rtd[i].codec->suspend_bias_level = card->rtd[i].codec->bias_level;
 +		card->rtd[i].codec->dapm.suspend_bias_level = card->rtd[i].codec->dapm.bias_level;
  	}
  
  	for (i = 0; i < card->num_rtd; i++) {
@@@ -1921,13 -1668,9 +1902,13 @@@ static int soc_remove(struct platform_d
  		/* make sure any delayed work runs */
  		for (i = 0; i < card->num_rtd; i++) {
  			struct snd_soc_pcm_runtime *rtd = &card->rtd[i];
- 			run_delayed_work(&rtd->delayed_work);
+ 			flush_delayed_work_sync(&rtd->delayed_work);
  		}
  
 +		/* remove auxiliary devices */
 +		for (i = 0; i < card->num_aux_devs; i++)
 +			soc_remove_aux_dev(card, i);
 +
  		/* remove and free each DAI */
  		for (i = 0; i < card->num_rtd; i++)
  			soc_remove_dai_link(card, i);