/[openvortex]/alsa/alsa-kernel/pci/trident/trident.c
ViewVC logotype

Diff of /alsa/alsa-kernel/pci/trident/trident.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.1.1.1 by vizard, Tue Apr 15 21:35:42 2003 UTC revision 1.2 by vizard, Mon Aug 11 00:06:40 2003 UTC
# Line 132  static int __devinit snd_trident_probe(s Line 132  static int __devinit snd_trident_probe(s
132                  return err;                  return err;
133          }          }
134    
135  #if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE)  #if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && defined(CONFIG_SND_SEQUENCER_MODULE))
136          if ((err = snd_trident_attach_synthesizer(trident)) < 0) {          if ((err = snd_trident_attach_synthesizer(trident)) < 0) {
137                  snd_card_free(card);                  snd_card_free(card);
138                  return err;                  return err;
# Line 182  static void __devexit snd_trident_remove Line 182  static void __devexit snd_trident_remove
182  }  }
183    
184  #ifdef CONFIG_PM  #ifdef CONFIG_PM
 #ifndef PCI_OLD_SUSPEND  
185  static int snd_card_trident_suspend(struct pci_dev *pci, u32 state)  static int snd_card_trident_suspend(struct pci_dev *pci, u32 state)
186  {  {
187          trident_t *chip = snd_magic_cast(trident_t, pci_get_drvdata(pci), return -ENXIO);          trident_t *chip = snd_magic_cast(trident_t, pci_get_drvdata(pci), return -ENXIO);
# Line 195  static int snd_card_trident_resume(struc Line 194  static int snd_card_trident_resume(struc
194          snd_trident_resume(chip);          snd_trident_resume(chip);
195          return 0;          return 0;
196  }  }
 #else  
 static void snd_card_trident_suspend(struct pci_dev *pci)  
 {  
         trident_t *chip = snd_magic_cast(trident_t, pci_get_drvdata(pci), return);  
         snd_trident_suspend(chip);  
 }  
 static void snd_card_trident_resume(struct pci_dev *pci)  
 {  
         trident_t *chip = snd_magic_cast(trident_t, pci_get_drvdata(pci), return);  
         snd_trident_resume(chip);  
 }  
 #endif  
197  #endif  #endif
198    
199  static struct pci_driver driver = {  static struct pci_driver driver = {

Legend:
Removed from v.1.1.1.1  
changed lines
  Added in v.1.2

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26