Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv17104
Modified Files:
es1968.c
Log Message:
- added the vendor 1179 to the PM white list.
- use short for reading vendor id.
Index: es1968.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/es1968.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- es1968.c 18 Jun 2003 11:07:21 -0000 1.41
+++ es1968.c 7 Jul 2003 12:34:38 -0000 1.42
@@ -2092,7 +2092,7 @@
unsigned short save_ringbus_a;
unsigned short save_68;
unsigned short w;
- unsigned int vend;
+ unsigned short vend;
/* save configuration */
save_ringbus_a = inw(ioaddr + 0x36);
@@ -2106,7 +2106,7 @@
outw(0x0000, ioaddr + 0x36);
save_68 = inw(ioaddr + 0x68);
pci_read_config_word(chip->pci, 0x58, &w); /* something magical with gpio
and bus arb. */
- pci_read_config_dword(chip->pci, PCI_SUBSYSTEM_VENDOR_ID, &vend);
+ pci_read_config_word(chip->pci, PCI_SUBSYSTEM_VENDOR_ID, &vend);
if (w & 1)
save_68 |= 0x10;
outw(0xfffe, ioaddr + 0x64); /* unmask gpio 0 */
@@ -2605,9 +2605,9 @@
/* disable power-management if not maestro2e or
* if not on the whitelist
*/
- unsigned int vend;
- pci_read_config_dword(chip->pci, PCI_SUBSYSTEM_VENDOR_ID, &vend);
- if (chip->type != TYPE_MAESTRO2E || (vend & 0xffff) != 0x1028) {
+ unsigned short vend;
+ pci_read_config_word(chip->pci, PCI_SUBSYSTEM_VENDOR_ID, &vend);
+ if (chip->type != TYPE_MAESTRO2E || (vend != 0x1028 && vend !=
0x1179)) {
printk(KERN_INFO "es1968: not attempting power management.\n");
do_pm = 0;
}
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100006ave/direct;at.asp_061203_01/01
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
