tg3: Unwedge stuck MSI-X vectors

[safe/jmp/linux-2.6] / sound / pci / sis7019.c

diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c
index dcd7cd0..1a5ff06 100644 (file)
--- a/sound/pci/sis7019.c
+++ b/sound/pci/sis7019.c
@@ -920,7 +920,7 @@ static unsigned short sis_ac97_rw(struct sis7019 *sis, int codec, u32 cmd)
        u16 status;
        u16 rdy;
        int count;
-       const static u16 codec_ready[3] = {
+       static const u16 codec_ready[3] = {
                SIS_AC97_STATUS_CODEC_READY,
                SIS_AC97_STATUS_CODEC2_READY,
                SIS_AC97_STATUS_CODEC3_READY,
@@ -984,7 +984,7 @@ timeout:
 static void sis_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
                                unsigned short val)
 {
-       const static u32 cmd[3] = {
+       static const u32 cmd[3] = {
                SIS_AC97_CMD_CODEC_WRITE,
                SIS_AC97_CMD_CODEC2_WRITE,
                SIS_AC97_CMD_CODEC3_WRITE,
@@ -995,7 +995,7 @@ static void sis_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
 
 static unsigned short sis_ac97_read(struct snd_ac97 *ac97, unsigned short reg)
 {
-       const static u32 cmd[3] = {
+       static const u32 cmd[3] = {
                SIS_AC97_CMD_CODEC_READ,
                SIS_AC97_CMD_CODEC2_READ,
                SIS_AC97_CMD_CODEC3_READ,
@@ -1194,7 +1194,6 @@ static int sis_suspend(struct pci_dev *pci, pm_message_t state)
        /* snd_pcm_suspend_all() stopped all channels, so we're quiescent.
         */
        if (sis->irq >= 0) {
-               synchronize_irq(sis->irq);
                free_irq(sis->irq, sis);
                sis->irq = -1;
        }
@@ -1301,7 +1300,7 @@ static int __devinit sis_chip_create(struct snd_card *card,
        if (rc)
                goto error_out;
 
-       if (pci_set_dma_mask(pci, DMA_30BIT_MASK) < 0) {
+       if (pci_set_dma_mask(pci, DMA_BIT_MASK(30)) < 0) {
                printk(KERN_ERR "sis7019: architecture does not support "
                                        "30-bit PCI busmaster DMA");
                goto error_out_enabled;
@@ -1388,9 +1387,8 @@ static int __devinit snd_sis7019_probe(struct pci_dev *pci,
        if (!enable)
                goto error_out;
 
-       rc = -ENOMEM;
-       card = snd_card_new(index, id, THIS_MODULE, sizeof(*sis));
-       if (!card)
+       rc = snd_card_create(index, id, THIS_MODULE, sizeof(*sis), &card);
+       if (rc < 0)
                goto error_out;
 
        strcpy(card->driver, "SiS7019");