aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/oxygen/oxygen_lib.c
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2009-02-19 08:38:55 +0100
committerTakashi Iwai <tiwai@suse.de>2009-02-19 10:22:24 +0100
commita69bb3c3fe0881d986ec78e253cb8a6bb9c28230 (patch)
tree8fdd56118e4237209d7dc29b1f4f5fbce4cb0077 /sound/pci/oxygen/oxygen_lib.c
parent6ed91157093c60e26bf0215b752f07af52935afc (diff)
downloadmrst-s0i3-test-a69bb3c3fe0881d986ec78e253cb8a6bb9c28230.tar.gz
mrst-s0i3-test-a69bb3c3fe0881d986ec78e253cb8a6bb9c28230.tar.xz
mrst-s0i3-test-a69bb3c3fe0881d986ec78e253cb8a6bb9c28230.zip
sound: oxygen: use static driver name
When allocating resources, use a fixed name instead of reading it from the model structure. This allows us to allocate the resources before the actual model is known. 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.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c
index 228f30800fd..516d94ad2bb 100644
--- a/sound/pci/oxygen/oxygen_lib.c
+++ b/sound/pci/oxygen/oxygen_lib.c
@@ -34,6 +34,7 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
MODULE_DESCRIPTION("C-Media CMI8788 helper library");
MODULE_LICENSE("GPL v2");
+#define DRIVER "oxygen"
static inline int oxygen_uart_input_ready(struct oxygen *chip)
{
@@ -481,7 +482,7 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
if (err < 0)
goto err_card;
- err = pci_request_regions(pci, model->chip);
+ err = pci_request_regions(pci, DRIVER);
if (err < 0) {
snd_printk(KERN_ERR "cannot reserve PCI resources\n");
goto err_pci_enable;
@@ -517,7 +518,7 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
chip->model.init(chip);
err = request_irq(pci->irq, oxygen_interrupt, IRQF_SHARED,
- chip->model.chip, chip);
+ DRIVER, chip);
if (err < 0) {
snd_printk(KERN_ERR "cannot grab interrupt %d\n", pci->irq);
goto err_card;