diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2008-09-22 02:56:01 -0400 |
---|---|---|
committer | Clemens Ladisch <clemens@ladisch.de> | 2008-09-22 02:56:01 -0400 |
commit | 568c59e722da22c9b0a485c2f1aaf28cb1b36b79 (patch) | |
tree | 295bdb15737e938992a9cd01450be516276b0ccd /sound/pci/oxygen/oxygen.c | |
parent | 9bd6a73aef955216816fd6e28f371a868ed073d5 (diff) |
ALSA: oxygen: add probe callback
Add a probe callback to the model structure so that model-specific
drivers can refine their model detection before the card is initialized.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'sound/pci/oxygen/oxygen.c')
-rw-r--r-- | sound/pci/oxygen/oxygen.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c index c5829d30ef86..4722fe08dca8 100644 --- a/sound/pci/oxygen/oxygen.c +++ b/sound/pci/oxygen/oxygen.c | |||
@@ -354,7 +354,8 @@ static int __devinit generic_oxygen_probe(struct pci_dev *pci, | |||
354 | } | 354 | } |
355 | is_meridian = pci_id->driver_data; | 355 | is_meridian = pci_id->driver_data; |
356 | err = oxygen_pci_probe(pci, index[dev], id[dev], | 356 | err = oxygen_pci_probe(pci, index[dev], id[dev], |
357 | is_meridian ? &model_meridian : &model_generic); | 357 | is_meridian ? &model_meridian : &model_generic, |
358 | 0); | ||
358 | if (err >= 0) | 359 | if (err >= 0) |
359 | ++dev; | 360 | ++dev; |
360 | return err; | 361 | return err; |