aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/oxygen/oxygen_lib.c
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2009-02-19 08:38:25 +0100
committerTakashi Iwai <tiwai@suse.de>2009-02-19 10:22:23 +0100
commit6ed91157093c60e26bf0215b752f07af52935afc (patch)
treec1dbc3089cb20d6f36c6fd482b998316ede73390 /sound/pci/oxygen/oxygen_lib.c
parentbb71858853a5c9616eea98512f4075d4f081154d (diff)
downloadmrst-s0i3-test-6ed91157093c60e26bf0215b752f07af52935afc.tar.gz
mrst-s0i3-test-6ed91157093c60e26bf0215b752f07af52935afc.tar.xz
mrst-s0i3-test-6ed91157093c60e26bf0215b752f07af52935afc.zip
sound: oxygen: allocate model_data dynamically
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>
Diffstat (limited to 'sound/pci/oxygen/oxygen_lib.c')
-rw-r--r--sound/pci/oxygen/oxygen_lib.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c
index b5560fa5a5e..228f30800fd 100644
--- a/sound/pci/oxygen/oxygen_lib.c
+++ b/sound/pci/oxygen/oxygen_lib.c
@@ -446,6 +446,7 @@ static void oxygen_card_free(struct snd_card *card)
free_irq(chip->irq, chip);
flush_scheduled_work();
chip->model.cleanup(chip);
+ kfree(chip->model_data);
mutex_destroy(&chip->mutex);
pci_release_regions(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;
int err;
- err = snd_card_create(index, id, owner,
- sizeof(*chip) + model->model_data_size, &card);
+ err = snd_card_create(index, id, owner, sizeof(*chip), &card);
if (err < 0)
return err;
@@ -470,7 +470,6 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
chip->pci = pci;
chip->irq = -1;
chip->model = *model;
- chip->model_data = chip + 1;
spin_lock_init(&chip->reg_lock);
mutex_init(&chip->mutex);
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);
+ 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);
snd_card_set_dev(card, &pci->dev);
card->private_free = oxygen_card_free;