From: Jens Axboe <axboe@suse.de>
Date: Fri, 6 May 2005 06:37:44 +0000 (+0200)
Subject: [PATCH] fix alsa via82xx resume
X-Git-Tag: v2.6.12-rc4~22
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b3214970abbe983cd89842ae24ea00e21bba79f6;p=linux-2.6-omap-h63xx.git

[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>
---

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;