/[openvortex]/alsa/alsa-kernel/isa/sb/sb16.c
ViewVC logotype

Diff of /alsa/alsa-kernel/isa/sb/sb16.c

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

revision 1.2 by vizard, Sat May 31 02:35:11 2003 UTC revision 1.3 by vizard, Mon Aug 11 00:06:39 2003 UTC
# Line 66  MODULE_DEVICES("{{Creative Labs,SB AWE 3 Line 66  MODULE_DEVICES("{{Creative Labs,SB AWE 3
66  #define SNDRV_DEBUG_IRQ  #define SNDRV_DEBUG_IRQ
67  #endif  #endif
68    
69  #if defined(SNDRV_SBAWE) && (defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE))  #if defined(SNDRV_SBAWE) && (defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && defined(CONFIG_SND_SEQUENCER_MODULE)))
70  #define SNDRV_SBAWE_EMU8000  #define SNDRV_SBAWE_EMU8000
71  #endif  #endif
72    
# Line 350  __wt_error: Line 350  __wt_error:
350    
351  #endif /* CONFIG_PNP */  #endif /* CONFIG_PNP */
352    
353    static void snd_sb16_free(snd_card_t *card)
354    {
355            struct snd_card_sb16 *acard = (struct snd_card_sb16 *)card->private_data;
356            
357            if (acard == NULL)
358                    return;
359            if (acard->fm_res) {
360                    release_resource(acard->fm_res);
361                    kfree_nocheck(acard->fm_res);
362            }
363    }
364    
365  static int __init snd_sb16_probe(int dev,  static int __init snd_sb16_probe(int dev,
366                                   struct pnp_card_link *pcard,                                   struct pnp_card_link *pcard,
367                                   const struct pnp_card_device_id *pid)                                   const struct pnp_card_device_id *pid)
# Line 374  static int __init snd_sb16_probe(int dev Line 386  static int __init snd_sb16_probe(int dev
386          if (card == NULL)          if (card == NULL)
387                  return -ENOMEM;                  return -ENOMEM;
388          acard = (struct snd_card_sb16 *) card->private_data;          acard = (struct snd_card_sb16 *) card->private_data;
389            card->private_free = snd_sb16_free;
390  #ifdef CONFIG_PNP  #ifdef CONFIG_PNP
391          if (isapnp[dev]) {          if (isapnp[dev]) {
392                  if ((err = snd_card_sb16_pnp(dev, acard, pcard, pid))) {                  if ((err = snd_card_sb16_pnp(dev, acard, pcard, pid))) {
# Line 464  static int __init snd_sb16_probe(int dev Line 477  static int __init snd_sb16_probe(int dev
477    
478          if (fm_port[dev] > 0) {          if (fm_port[dev] > 0) {
479                  if (snd_opl3_create(card, fm_port[dev], fm_port[dev] + 2,                  if (snd_opl3_create(card, fm_port[dev], fm_port[dev] + 2,
480                                      OPL3_HW_OPL3, fm_port[dev] == port[dev],                                      OPL3_HW_OPL3,
481                                        fm_port[dev] == port[dev] || fm_port[dev] == 0x388,
482                                      &opl3) < 0) {                                      &opl3) < 0) {
483                          snd_printk(KERN_ERR PFX "no OPL device at 0x%lx-0x%lx\n",                          snd_printk(KERN_ERR PFX "no OPL device at 0x%lx-0x%lx\n",
484                                     fm_port[dev], fm_port[dev] + 2);                                     fm_port[dev], fm_port[dev] + 2);

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

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