From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 28 Jun 2013 11:36:22 +0000 (+0200)
Subject: Merge tag 'asoc-v3.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=accaf69da1d1e64bd77ac0caad77e4cfc3b654c7;p=linux-beck.git

Merge tag 'asoc-v3.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: More updates for v3.11

Some more fixes and enhancements, and also a bunch of refectoring for
AC'97 support which enables more than one AC'97 controller driver to be
built in.
---

accaf69da1d1e64bd77ac0caad77e4cfc3b654c7
diff --cc sound/soc/cirrus/ep93xx-ac97.c
index 3f4f88877c84,4bc9490e2c84..ac73c607410a
--- a/sound/soc/cirrus/ep93xx-ac97.c
+++ b/sound/soc/cirrus/ep93xx-ac97.c
@@@ -397,8 -406,9 +400,8 @@@ static int ep93xx_ac97_probe(struct pla
  	return 0;
  
  fail:
 -	platform_set_drvdata(pdev, NULL);
  	ep93xx_ac97_info = NULL;
- 	dev_set_drvdata(&pdev->dev, NULL);
+ 	snd_soc_set_ac97_ops(NULL);
  	return ret;
  }
  
@@@ -411,8 -421,10 +414,9 @@@ static int ep93xx_ac97_remove(struct pl
  	/* disable the AC97 controller */
  	ep93xx_ac97_write_reg(info, AC97GCR, 0);
  
 -	platform_set_drvdata(pdev, NULL);
  	ep93xx_ac97_info = NULL;
- 	dev_set_drvdata(&pdev->dev, NULL);
+ 
+ 	snd_soc_set_ac97_ops(NULL);
  
  	return 0;
  }