Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (30 commits)
  m68k: Fix --build-id breakage for sun3
  m68k: Wire up sys_restart_syscall
  fbdev: Kill Atari vblank cursor blinking
  m68k: zorro - Use %pR to print resources
  m68k: dio - Kill resource_size_t format warnings
  m68k: dmasound - Kill warn_unused_result warnings
  m68k: zorro - Kill warn_unused_result warnings
  m68k: dio - Kill warn_unused_result warnings
  m68k: atafb - Kill warn_unused_result warnings
  m68k: amiserial - Kill warn_unused_result warnings
  m68k: ser_a2232 - Kill warn_unused_result warnings
  m68k: vme_scc - Kill warn_unused_result warnings
  m68k: sun3 core - Kill warn_unused_result warnings
  m68k: mvme147 core - Kill warn_unused_result warnings
  m68k: mac core - Kill warn_unused_result warnings
  m68k: hp300 core - Kill warn_unused_result warnings
  m68k: atari core - Kill warn_unused_result warnings
  m68k: apollo core - Kill warn_unused_result warnings
  m68k: amiga core - Kill warn_unused_result warnings
  m68k: Kill several external declarations in source files
  ...

2 files changed, 13 insertions, 8 deletions

diff --git a/sound/oss/dmasound/dmasound_atari.c b/sound/oss/dmasound/dmasound_atari.c
index 4d45bd63718b..57d9f154c88b 100644
--- a/sound/oss/dmasound/dmasound_atari.c
+++ b/sound/oss/dmasound/dmasound_atari.c
@@ -851,8 +851,9 @@ static int __init AtaIrqInit(void)
         mfp.tim_dt_a = 1;       /* Cause interrupt after first event. */
         mfp.tim_ct_a = 8;       /* Turn on event counting. */
         /* Register interrupt handler. */
-        request_irq(IRQ_MFP_TIMA, AtaInterrupt, IRQ_TYPE_SLOW, "DMA sound",
-                    AtaInterrupt);
+        if (request_irq(IRQ_MFP_TIMA, AtaInterrupt, IRQ_TYPE_SLOW, "DMA sound",
+                        AtaInterrupt))
+                return 0;
         mfp.int_en_a |= 0x20;   /* Turn interrupt on. */
         mfp.int_mk_a |= 0x20;
         return 1;
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);