Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-27 13:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] amiga_floppy_init() in non-modular case

Browse Source 
It used to be called directly, but that got lost in 2.1.87-pre1.
Similar breakage in ataflop got fixed 3 years ago, this one
had gone unnoticed.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Al Viro 2006-10-11 17:28:37 +01:00 committed by Linus Torvalds
parent 2e811488ce
commit 2db5f59ca7
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/block/amiflop.c
View File

@ -1709,10 +1709,13 @@ static struct kobject *floppy_find(dev_t dev, int *part, void *data)
return get_disk(unit[drive].gendisk); return get_disk(unit[drive].gendisk);
} }
int __init amiga_floppy_init(void) static int __init amiga_floppy_init(void)
{ {
int i, ret; int i, ret;
if (!MACH_IS_AMIGA)
return -ENXIO;
if (!AMIGAHW_PRESENT(AMI_FLOPPY)) if (!AMIGAHW_PRESENT(AMI_FLOPPY))
return -ENXIO; return -ENXIO;
@ -1809,15 +1812,9 @@ out_blkdev:
return ret; return ret;
} }
module_init(amiga_floppy_init);
#ifdef MODULE #ifdef MODULE
int init_module(void)
{
if (!MACH_IS_AMIGA)
return -ENXIO;
return amiga_floppy_init();
}
#if 0 /* not safe to unload */ #if 0 /* not safe to unload */
void cleanup_module(void) void cleanup_module(void)
{ {