diff options
| author | Zheng Da <zhengda1936@gmail.com> | 2010-08-08 13:05:23 +0200 |
|---|---|---|
| committer | Zheng Da <zhengda1936@gmail.com> | 2010-08-08 13:05:23 +0200 |
| commit | 7cd709038cc5c25d66d4bacc8c7c1268d9d3f5dd (patch) | |
| tree | d96316d912c35abb948a0ae88caf31b2ff2dcee3 /windhoek/ide/ide-generic.c | |
| parent | 793af51f505adfa1ea138dc76be731faab58b1a6 (diff) | |
for debugging IDE.
Diffstat (limited to 'windhoek/ide/ide-generic.c')
| -rw-r--r-- | windhoek/ide/ide-generic.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/windhoek/ide/ide-generic.c b/windhoek/ide/ide-generic.c index d9636b67..7c9cae02 100644 --- a/windhoek/ide/ide-generic.c +++ b/windhoek/ide/ide-generic.c @@ -30,7 +30,7 @@ #define DRV_NAME "ide_generic" -static int probe_mask; +static int probe_mask = 0x3f; module_param(probe_mask, int, 0); MODULE_PARM_DESC(probe_mask, "probe mask for legacy ISA IDE ports"); @@ -158,7 +158,7 @@ static int __init ide_generic_init(void) printk(KERN_INFO DRV_NAME ": enforcing probing of I/O ports " "upon user request\n"); - for (i = 0; i < ARRAY_SIZE(legacy_bases); i++) { + i = 1; io_addr = legacy_bases[i]; if ((probe_mask & (1 << i)) && io_addr) { @@ -166,7 +166,7 @@ static int __init ide_generic_init(void) printk(KERN_ERR "%s: I/O resource 0x%lX-0x%lX " "not free.\n", DRV_NAME, io_addr, io_addr + 7); - continue; + goto out; } if (!request_region(io_addr + 0x206, 1, DRV_NAME)) { @@ -174,7 +174,7 @@ static int __init ide_generic_init(void) "not free.\n", DRV_NAME, io_addr + 0x206); release_region(io_addr, 8); - continue; + goto out; } memset(&hw, 0, sizeof(hw)); @@ -192,8 +192,8 @@ static int __init ide_generic_init(void) release_region(io_addr, 8); } } - } +out: if (ide_generic_sysfs_init()) printk(KERN_ERR DRV_NAME ": failed to create ide_generic " "class\n"); |