kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sound: oxygen: allocate model_data dynamically

Browse source 
Allocate the model-specific data dynamically instead of including it in
the memory block of the card structure.  This will allow us to determine
the actual model after the card creation.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Clemens Ladisch 2009-02-19 08:38:25 +01:00 committed by Takashi Iwai
parent bb71858853
commit 6ed9115709
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sound/pci/oxygen/oxygen_lib.c
View file

@ -446,6 +446,7 @@ static void oxygen_card_free(struct snd_card *card)
free_irq(chip->irq, chip); free_irq(chip->irq, chip);
flush_scheduled_work(); flush_scheduled_work();
chip->model.cleanup(chip); chip->model.cleanup(chip);
kfree(chip->model_data);
mutex_destroy(&chip->mutex); mutex_destroy(&chip->mutex);
pci_release_regions(chip->pci); pci_release_regions(chip->pci);
pci_disable_device(chip->pci); pci_disable_device(chip->pci);
@ -460,8 +461,7 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
struct oxygen *chip; struct oxygen *chip;
int err; int err;
err = snd_card_create(index, id, owner, err = snd_card_create(index, id, owner, sizeof(*chip), &card);
sizeof(*chip) + model->model_data_size, &card);
if (err < 0) if (err < 0)
return err; return err;
@ -470,7 +470,6 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
chip->pci = pci; chip->pci = pci;
chip->irq = -1; chip->irq = -1;
chip->model = *model; chip->model = *model;
chip->model_data = chip + 1;
spin_lock_init(&chip->reg_lock); spin_lock_init(&chip->reg_lock);
mutex_init(&chip->mutex); mutex_init(&chip->mutex);
INIT_WORK(&chip->spdif_input_bits_work, INIT_WORK(&chip->spdif_input_bits_work,
@ -496,6 +495,15 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
} }
chip->addr = pci_resource_start(pci, 0); chip->addr = pci_resource_start(pci, 0);
if (chip->model.model_data_size) {
chip->model_data = kmalloc(chip->model.model_data_size,
GFP_KERNEL);
if (!chip->model_data) {
err = -ENOMEM;
goto err_pci_regions;
}
}
pci_set_master(pci); pci_set_master(pci);
snd_card_set_dev(card, &pci->dev); snd_card_set_dev(card, &pci->dev);
card->private_free = oxygen_card_free; card->private_free = oxygen_card_free;