Merge with Linux 2.4.0.

1 files changed, 4 insertions, 7 deletions

diff --git a/arch/m68k/amiga/amisound.c b/arch/m68k/amiga/amisound.c
index 4c94f7862..aaec835f3 100644
--- a/arch/m68k/amiga/amisound.c
+++ b/arch/m68k/amiga/amisound.c
@@ -97,13 +97,10 @@ void amiga_mksound( unsigned int hz, unsigned int ticks )
 		/* turn on DMA for audio channel 2 */
 		custom.dmacon = DMAF_SETCLR | DMAF_AUD2;
 
-		restore_flags(flags);
-		return;
-	} else {
+	} else
 		nosound( 0 );
-		restore_flags(flags);
-		return;
-	}
+
+	restore_flags(flags);
 }
 
 
@@ -113,4 +110,4 @@ static void nosound( unsigned long ignored )
 	custom.dmacon = DMAF_AUD2;
 	/* restore period to previous value after beeping */
 	custom.aud[2].audper = amiga_audio_period;
-}	
+}