Title: [3997] trunk/sound/soc/blackfin/bf5xx-ac97.c: bug[#3725]
restore to former rivision,GPIO label shouldn't be NULL
- Revision
- 3997
- Author
- cliff
- Date
- 2007-12-06 01:37:50 -0600 (Thu, 06 Dec 2007)
Log Message
bug[#3725]restore to former rivision,GPIO label shouldn't be NULL
Diffstat
bf5xx-ac97.c | 9 ---------
1 files changed, 9 deletions(-)
Modified Paths
Diff
Modified: trunk/sound/soc/blackfin/bf5xx-ac97.c (3996 => 3997)
--- trunk/sound/soc/blackfin/bf5xx-ac97.c 2007-12-06 06:30:52 UTC (rev 3996)
+++ trunk/sound/soc/blackfin/bf5xx-ac97.c 2007-12-06 07:37:50 UTC (rev 3997)
@@ -299,21 +299,12 @@
#ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET
/* Request PB3 as reset pin */
-#if defined(CONFIG_BF54x)
- if (gpio_request(CONFIG_SND_BF5XX_RESET_GPIO_NUM, NULL)) {
- printk(KERN_ERR "Failed to request GPIO_%d for reset\n",
- CONFIG_SND_BF5XX_RESET_GPIO_NUM);
- peripheral_free_list(&sport_req[sport_num][0]);
- return -1;
- }
-#else
if (gpio_request(CONFIG_SND_BF5XX_RESET_GPIO_NUM, "SND_AD198x RESET")) {
printk(KERN_ERR "Failed to request GPIO_%d for reset\n",
CONFIG_SND_BF5XX_RESET_GPIO_NUM);
peripheral_free_list(&sport_req[sport_num][0]);
return -1;
}
-#endif
gpio_direction_output(CONFIG_SND_BF5XX_RESET_GPIO_NUM);
gpio_set_value(CONFIG_SND_BF5XX_RESET_GPIO_NUM, 1);
#endif
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
