Merge branch 'linus' into core/iommu

Conflicts:
	arch/ia64/include/asm/dma-mapping.h
	arch/ia64/include/asm/machvec.h
	arch/ia64/include/asm/machvec_sn2.h

1 files changed, 10 insertions, 6 deletions

diff --git a/sound/oss/dmasound/dmasound_q40.c b/sound/oss/dmasound/dmasound_q40.c
index 1855b14d90c3..99bcb21c2281 100644
--- a/sound/oss/dmasound/dmasound_q40.c
+++ b/sound/oss/dmasound/dmasound_q40.c
@@ -371,8 +371,9 @@ static void Q40Free(void *ptr, unsigned int size)
 static int __init Q40IrqInit(void)
 {
         /* Register interrupt handler. */
-        request_irq(Q40_IRQ_SAMPLE, Q40StereoInterrupt, 0,
-                    "DMA sound", Q40Interrupt);
+        if (request_irq(Q40_IRQ_SAMPLE, Q40StereoInterrupt, 0,
+                    "DMA sound", Q40Interrupt))
+                return 0;
 
         return(1);
 }
@@ -401,6 +402,7 @@ static void Q40PlayNextFrame(int index)
         u_char *start;
         u_long size;
         u_char speed;
+        int error;
 
         /* used by Q40Play() if all doubts whether there really is something
          * to be played are already wiped out.
@@ -419,11 +421,13 @@ static void Q40PlayNextFrame(int index)
         master_outb( 0,SAMPLE_ENABLE_REG);
         free_irq(Q40_IRQ_SAMPLE, Q40Interrupt);
         if (dmasound.soft.stereo)
-                request_irq(Q40_IRQ_SAMPLE, Q40StereoInterrupt, 0,
-                    "Q40 sound", Q40Interrupt);
+                error = request_irq(Q40_IRQ_SAMPLE, Q40StereoInterrupt, 0,
+                                    "Q40 sound", Q40Interrupt);
           else
-                request_irq(Q40_IRQ_SAMPLE, Q40MonoInterrupt, 0,
-                    "Q40 sound", Q40Interrupt);
+                error = request_irq(Q40_IRQ_SAMPLE, Q40MonoInterrupt, 0,
+                                    "Q40 sound", Q40Interrupt);
+        if (error && printk_ratelimit())
+                pr_err("Couldn't register sound interrupt\n");
 
         master_outb( speed, SAMPLE_RATE_REG);
         master_outb( 1,SAMPLE_CLEAR_REG);