/[openvortex]/alsa/alsa-kernel/sound_core.c
ViewVC logotype

Diff of /alsa/alsa-kernel/sound_core.c

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

revision 1.2 by vizard, Sat May 31 02:35:09 2003 UTC revision 1.3 by vizard, Sun Jun 15 21:01:30 2003 UTC
# Line 168  static int sound_insert_unit(struct soun Line 168  static int sound_insert_unit(struct soun
168          else          else
169                  sprintf(s->name, "sound/%s%d", name, r / SOUND_STEP);                  sprintf(s->name, "sound/%s%d", name, r / SOUND_STEP);
170    
171          devfs_register(NULL, s->name, 0, SOUND_MAJOR, s->unit_minor,          devfs_mk_cdev(MKDEV(SOUND_MAJOR, s->unit_minor),
172                          S_IFCHR | mode, fops, NULL);                          S_IFCHR | mode, s->name);
173          return r;          return r;
174    
175   fail:   fail:
# Line 500  int soundcore_open(struct inode *inode, Line 500  int soundcore_open(struct inode *inode,
500          if (s)          if (s)
501                  new_fops = fops_get(s->unit_fops);                  new_fops = fops_get(s->unit_fops);
502          if (!new_fops) {          if (!new_fops) {
                 char mod[32];  
           
503                  spin_unlock(&sound_loader_lock);                  spin_unlock(&sound_loader_lock);
504                  /*                  /*
505                   *  Please, don't change this order or code.                   *  Please, don't change this order or code.
# Line 510  int soundcore_open(struct inode *inode, Line 508  int soundcore_open(struct inode *inode,
508                   *  ALSA toplevel modules for soundcards, thus we need                   *  ALSA toplevel modules for soundcards, thus we need
509                   *  load them at first.   [Jaroslav Kysela <perex@jcu.cz>]                   *  load them at first.   [Jaroslav Kysela <perex@jcu.cz>]
510                   */                   */
511                  sprintf(mod, "sound-slot-%i", unit>>4);                  request_module("sound-slot-%i", unit>>4);
512                  request_module(mod);                  request_module("sound-service-%i-%i", unit>>4, chain);
                 sprintf(mod, "sound-service-%i-%i", unit>>4, chain);  
                 request_module(mod);  
513                  spin_lock(&sound_loader_lock);                  spin_lock(&sound_loader_lock);
514                  s = __look_for_unit(chain, unit);                  s = __look_for_unit(chain, unit);
515                  if (s)                  if (s)

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