Commit 5a75b658 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] sgalaxy cleanup and check_region() removal

probing cleaned up, handling of ports mostly fixed.
Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 97c1bc4e
No related merge requests found
...@@ -86,19 +86,21 @@ static int __init sb_cmd( int base, unsigned char val ) ...@@ -86,19 +86,21 @@ static int __init sb_cmd( int base, unsigned char val )
static int __init probe_sgalaxy( struct address_info *ai ) static int __init probe_sgalaxy( struct address_info *ai )
{ {
int n;
if ( check_region( ai->io_base, 8 ) ) { if ( check_region( ai->io_base, 8 ) ) {
printk(KERN_ERR "sgalaxy: WSS IO port 0x%03x not available\n", ai->io_base); printk(KERN_ERR "sgalaxy: WSS IO port 0x%03x not available\n", ai->io_base);
return 0; return 0;
} }
if ( ad1848_detect( ai->io_base+4, NULL, ai->osp ) ) if (!request_region( ai->ai_sgbase, 0x10, "SoundGalaxy SB")) {
return probe_ms_sound(ai); /* The card is already active, check irq etc... */
if ( check_region( ai->ai_sgbase, 0x10 ) ) {
printk(KERN_ERR "sgalaxy: SB IO port 0x%03x not available\n", ai->ai_sgbase); printk(KERN_ERR "sgalaxy: SB IO port 0x%03x not available\n", ai->ai_sgbase);
return 0; return 0;
} }
if ( ad1848_detect( ai->io_base+4, NULL, ai->osp ) )
goto out;
/* switch to MSS/WSS mode */ /* switch to MSS/WSS mode */
sb_rst( ai->ai_sgbase ); sb_rst( ai->ai_sgbase );
...@@ -108,14 +110,11 @@ static int __init probe_sgalaxy( struct address_info *ai ) ...@@ -108,14 +110,11 @@ static int __init probe_sgalaxy( struct address_info *ai )
sleep( HZ/10 ); sleep( HZ/10 );
return probe_ms_sound(ai); out:
} if (!probe_ms_sound(ai)) {
release_region(ai->ai_sgbase, 0x10);
static void __init attach_sgalaxy( struct address_info *ai ) return 0;
{ }
int n;
request_region( ai->ai_sgbase, 0x10, "SoundGalaxy SB" );
attach_ms_sound(ai, THIS_MODULE); attach_ms_sound(ai, THIS_MODULE);
n=ai->slots[0]; n=ai->slots[0];
...@@ -125,6 +124,7 @@ static void __init attach_sgalaxy( struct address_info *ai ) ...@@ -125,6 +124,7 @@ static void __init attach_sgalaxy( struct address_info *ai )
AD1848_REROUTE( SOUND_MIXER_LINE2, SOUND_MIXER_SYNTH ); /* FM+Wavetable*/ AD1848_REROUTE( SOUND_MIXER_LINE2, SOUND_MIXER_SYNTH ); /* FM+Wavetable*/
AD1848_REROUTE( SOUND_MIXER_LINE3, SOUND_MIXER_CD ); /* CD */ AD1848_REROUTE( SOUND_MIXER_LINE3, SOUND_MIXER_CD ); /* CD */
} }
return 1;
} }
static void __exit unload_sgalaxy( struct address_info *ai ) static void __exit unload_sgalaxy( struct address_info *ai )
...@@ -163,8 +163,6 @@ static int __init init_sgalaxy(void) ...@@ -163,8 +163,6 @@ static int __init init_sgalaxy(void)
if ( probe_sgalaxy(&cfg) == 0 ) if ( probe_sgalaxy(&cfg) == 0 )
return -ENODEV; return -ENODEV;
attach_sgalaxy(&cfg);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment