diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-15 15:38:26 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-15 15:38:26 +0200 |
| commit | 60befb97f5ab11037f1ae7563ca7137878a7bd46 (patch) | |
| tree | 135fd84011d6f75eccbb7647c9b03957a800ed99 /sound/arm/pxa2xx-ac97-lib.c | |
| parent | a3d2b755c0e8f301c079d8aa5a761622259400fe (diff) | |
| parent | f492ec9f02908579353e31949855f86909a5af14 (diff) | |
| download | linux-3.10-60befb97f5ab11037f1ae7563ca7137878a7bd46.tar.gz linux-3.10-60befb97f5ab11037f1ae7563ca7137878a7bd46.tar.bz2 linux-3.10-60befb97f5ab11037f1ae7563ca7137878a7bd46.zip | |
Merge branch 'fix/asoc' into for-linus
* fix/asoc:
ASoC: DaVinci EVM board support buildfixes
ASoC: DaVinci I2S updates
ASoC: davinci-pcm buildfixes
pxa2xx-ac97: fix reset gpio mode setting
ASoC: soc-core: fix crash when removing not instantiated card
Diffstat (limited to 'sound/arm/pxa2xx-ac97-lib.c')
| -rw-r--r-- | sound/arm/pxa2xx-ac97-lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c index a2c12d105c9..6fdca97186e 100644 --- a/sound/arm/pxa2xx-ac97-lib.c +++ b/sound/arm/pxa2xx-ac97-lib.c @@ -65,7 +65,7 @@ static void set_resetgpio_mode(int resetgpio_action) switch (resetgpio_action) { case RESETGPIO_NORMAL_ALTFUNC: if (reset_gpio == 113) - mode = 113 | GPIO_OUT | GPIO_DFLT_LOW; + mode = 113 | GPIO_ALT_FN_2_OUT; if (reset_gpio == 95) mode = 95 | GPIO_ALT_FN_1_OUT; break; |