Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv26621
Modified Files:
intel8x0.c
Log Message:
- fixed oops at unloading the module without joystick.
- fixed the silent problem on sis7012.
Index: intel8x0.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/intel8x0.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- intel8x0.c 10 Jan 2003 12:13:52 -0000 1.57
+++ intel8x0.c 10 Jan 2003 13:55:58 -0000 1.58
@@ -1808,6 +1808,10 @@
} while (time_after_eq(end_time, jiffies));
__ok3:
+ if (chip->device_type == DEVICE_SIS) {
+ /* unmute the output on SIS7012 */
+ iputword(chip, 0x4c, igetword(chip, 0x4c) | 1);
+ }
return 0;
}
@@ -2494,6 +2498,8 @@
.id_table = snd_intel8x0_joystick_ids,
.probe = snd_intel8x0_joystick_probe,
};
+
+static int have_joystick;
#endif
static int __init alsa_card_intel8x0_init(void)
@@ -2507,7 +2513,13 @@
return err;
}
#if defined(SUPPORT_JOYSTICK) || defined(SUPPORT_MIDI)
- pci_module_init(&joystick_driver);
+ if (pci_module_init(&joystick_driver) < 0) {
+ snd_printdd(KERN_INFO "no joystick found\n");
+ have_joystick = 0;
+ } else {
+ snd_printdd(KERN_INFO "joystick(s) found\n");
+ have_joystick = 1;
+ }
#endif
return 0;
@@ -2517,7 +2529,8 @@
{
pci_unregister_driver(&driver);
#if defined(SUPPORT_JOYSTICK) || defined(SUPPORT_MIDI)
- pci_unregister_driver(&joystick_driver);
+ if (have_joystick)
+ pci_unregister_driver(&joystick_driver);
#endif
}
-------------------------------------------------------
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
