diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2005-11-20 14:06:59 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 12:29:17 +0100 |
| commit | f87135f56cb266e031f5ec081dfbde7e43f55e80 (patch) | |
| tree | c048abae6bb04df53f5d8d7dcffbf2c28bc638ff /sound/core/control.c | |
| parent | 6983b7240cd229787c3ee00e663ea94ea649d96a (diff) | |
[ALSA] dynamic minors (3/6): store device-specific object pointers dynamically
Instead of storing the pointers to the device-specific structures in an
array, put them into the struct snd_minor, and look them up dynamically.
This makes the device type modules independent of the minor number
encoding.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'sound/core/control.c')
| -rw-r--r-- | sound/core/control.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/core/control.c b/sound/core/control.c index 23561e74712..abd62f94372 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -47,13 +47,12 @@ static LIST_HEAD(snd_control_compat_ioctls); static int snd_ctl_open(struct inode *inode, struct file *file) { - int cardnum = SNDRV_MINOR_CARD(iminor(inode)); unsigned long flags; struct snd_card *card; struct snd_ctl_file *ctl; int err; - card = snd_cards[cardnum]; + card = snd_lookup_minor_data(iminor(inode), SNDRV_DEVICE_TYPE_CONTROL); if (!card) { err = -ENODEV; goto __error1; @@ -1277,8 +1276,8 @@ static int snd_ctl_dev_register(struct snd_device *device) cardnum = card->number; snd_assert(cardnum >= 0 && cardnum < SNDRV_CARDS, return -ENXIO); sprintf(name, "controlC%i", cardnum); - if ((err = snd_register_device(SNDRV_DEVICE_TYPE_CONTROL, - card, -1, &snd_ctl_f_ops, name)) < 0) + if ((err = snd_register_device(SNDRV_DEVICE_TYPE_CONTROL, card, -1, + &snd_ctl_f_ops, card, name)) < 0) return err; return 0; } |