diff options
| -rw-r--r-- | libdde_linux26/mk/binary.inc | 2 | ||||
| -rw-r--r-- | windhoek/Makefile | 4 | ||||
| -rw-r--r-- | windhoek/ide/ide-generic.c | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/libdde_linux26/mk/binary.inc b/libdde_linux26/mk/binary.inc index 2cd4b0a3..e35547f3 100644 --- a/libdde_linux26/mk/binary.inc +++ b/libdde_linux26/mk/binary.inc @@ -244,7 +244,7 @@ LDFLAGS += --hash-style=sysv endif endif -OPTS ?= -g -O2 -fno-strict-aliasing +OPTS ?= -g -fno-strict-aliasing WARNINGS?= -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(WARNINGS_$@) ifeq ($(MODE),host) diff --git a/windhoek/Makefile b/windhoek/Makefile index 858c1fff..91646bba 100644 --- a/windhoek/Makefile +++ b/windhoek/Makefile @@ -13,13 +13,13 @@ TARGET = windhoek IDE_SRC = ide.c ide-disk.c ide-generic.c ide-io.c ide-park.c \ ide-iops.c ide-lib.c ide-pm.c ide-pnp.c ide-probe.c ide-taskfile.c \ setup-pci.c ide-pci-generic.c ide-pio-blacklist.c ide-sysfs.c \ - piix.c ide-dma.c ide-gd.c + ide-dma.c ide-gd.c IDEFILES = $(addprefix ide/, $(IDE_SRC)) CDROM_SRC = #cdrom.c CDROMFILES = $(addprefix cdrom/, $(CDROM_SRC)) -PARTITION_SRC = msdos.c check.c +PARTITION_SRC = check.c PARTITIONFILES = $(addprefix partitions/, $(PARTITION_SRC)) SRC_C = main.c genhd.c 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"); |