aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorJens Axboe <axboe@suse.de>2005-05-06 08:37:44 +0200
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-06 08:07:01 -0700
commitb3214970abbe983cd89842ae24ea00e21bba79f6 (patch)
tree7eb5599932c67e65141f51fa4fdc7b4dc5a8be6b /sound
parent6c80a21cb1825e576ffff9df2302bf0fa1065ceb (diff)
downloadlinux-b3214970abbe983cd89842ae24ea00e21bba79f6.tar.gz
[PATCH] fix alsa via82xx resume
Trying software suspend on my workstation makes it crash on resume. The problem is that via82xx marks the chip_init function as _devinit, but calls it on resume as well. Cc: <tiwai@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jens Axboe <axboe@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/via82xx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index f1ce808501d..9b4d74d49f9 100644
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -1836,7 +1836,7 @@ static void __devinit snd_via82xx_proc_init(via82xx_t *chip)
*
*/
-static int __devinit snd_via82xx_chip_init(via82xx_t *chip)
+static int snd_via82xx_chip_init(via82xx_t *chip)
{
unsigned int val;
int max_count;