]> err.no Git - linux-2.6/commitdiff
[PATCH] fix alsa via82xx resume
authorJens Axboe <axboe@suse.de>
Fri, 6 May 2005 06:37:44 +0000 (08:37 +0200)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 6 May 2005 15:07:01 +0000 (08:07 -0700)
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>
sound/pci/via82xx.c

index f1ce808501da54e60039fd5a9ab99af30d77a0c5..9b4d74d49f984c9d6a19bc9fd4ccd5c35df1d49b 100644 (file)
@@ -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;