diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
| commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
| tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /sound/pci/rme96.c | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'sound/pci/rme96.c')
| -rw-r--r-- | sound/pci/rme96.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c index c495cae78dbf..0eddeb16a10f 100644 --- a/sound/pci/rme96.c +++ b/sound/pci/rme96.c | |||
| @@ -1570,13 +1570,13 @@ snd_rme96_create(rme96_t *rme96) | |||
| 1570 | rme96->port = pci_resource_start(rme96->pci, 0); | 1570 | rme96->port = pci_resource_start(rme96->pci, 0); |
| 1571 | 1571 | ||
| 1572 | if (request_irq(pci->irq, snd_rme96_interrupt, SA_INTERRUPT|SA_SHIRQ, "RME96", (void *)rme96)) { | 1572 | if (request_irq(pci->irq, snd_rme96_interrupt, SA_INTERRUPT|SA_SHIRQ, "RME96", (void *)rme96)) { |
| 1573 | snd_printk("unable to grab IRQ %d\n", pci->irq); | 1573 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
| 1574 | return -EBUSY; | 1574 | return -EBUSY; |
| 1575 | } | 1575 | } |
| 1576 | rme96->irq = pci->irq; | 1576 | rme96->irq = pci->irq; |
| 1577 | 1577 | ||
| 1578 | if ((rme96->iobase = ioremap_nocache(rme96->port, RME96_IO_SIZE)) == 0) { | 1578 | if ((rme96->iobase = ioremap_nocache(rme96->port, RME96_IO_SIZE)) == 0) { |
| 1579 | snd_printk("unable to remap memory region 0x%lx-0x%lx\n", rme96->port, rme96->port + RME96_IO_SIZE - 1); | 1579 | snd_printk(KERN_ERR "unable to remap memory region 0x%lx-0x%lx\n", rme96->port, rme96->port + RME96_IO_SIZE - 1); |
| 1580 | return -ENOMEM; | 1580 | return -ENOMEM; |
| 1581 | } | 1581 | } |
| 1582 | 1582 | ||