[ALSA] Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz

[mirror_ubuntu-artful-kernel.git] / sound / isa / sb / sb_common.c

diff --git a/sound/isa/sb/sb_common.c b/sound/isa/sb/sb_common.c
index f17de2bdd9e08a80f93286fdc16a167e83881f46..176193c05101007dae7b8c08d086da1632c7168f 100644 (file)
--- a/sound/isa/sb/sb_common.c
+++ b/sound/isa/sb/sb_common.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *                   Uros Bizjak <uros@kss-loka.si>
  *
  *  Lowlevel routines for control of Sound Blaster cards
@@ -33,7 +33,7 @@
 #include <asm/io.h>
 #include <asm/dma.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("ALSA lowlevel driver for Sound Blaster cards");
 MODULE_LICENSE("GPL");
 
@@ -128,7 +128,7 @@ static int snd_sbdsp_probe(struct snd_sb * chip)
        minor = version & 0xff;
        snd_printdd("SB [0x%lx]: DSP chip found, version = %i.%i\n",
                    chip->port, major, minor);
-       
+
        switch (chip->hardware) {
        case SB_HW_AUTO:
                switch (major) {
@@ -168,6 +168,9 @@ static int snd_sbdsp_probe(struct snd_sb * chip)
        case SB_HW_DT019X:
                str = "(DT019X/ALS007)";
                break;
+       case SB_HW_CS5530:
+               str = "16 (CS5530)";
+               break;
        default:
                return -ENODEV;
        }
@@ -205,7 +208,7 @@ static int snd_sbdsp_dev_free(struct snd_device *device)
 int snd_sbdsp_create(struct snd_card *card,
                     unsigned long port,
                     int irq,
-                    irqreturn_t (*irq_handler)(int, void *, struct pt_regs *),
+                    irq_handler_t irq_handler,
                     int dma8,
                     int dma16,
                     unsigned short hardware,
@@ -231,8 +234,10 @@ int snd_sbdsp_create(struct snd_card *card,
        chip->dma16 = -1;
        chip->port = port;
        
-       if (request_irq(irq, irq_handler, hardware == SB_HW_ALS4000 ?
-                       IRQF_DISABLED | IRQF_SHARED : IRQF_DISABLED,
+       if (request_irq(irq, irq_handler,
+                       (hardware == SB_HW_ALS4000 ||
+                        hardware == SB_HW_CS5530) ?
+                       IRQF_SHARED : IRQF_DISABLED,
                        "SoundBlaster", (void *) chip)) {
                snd_printk(KERN_ERR "sb: can't grab irq %d\n", irq);
                snd_sbdsp_free(chip);