Skip to content

Commit

Permalink
falconide: fix resources reservation (take 2)
Browse files Browse the repository at this point in the history
* Tell IDE layer to not manage resources by setting
  hwif->mmio flag and request resources in falconide_init().

* Use request_mem_region() for resources reservation.

* Use driver name for resources reservation.

v2:
* Fix missing printk() parameter. (Noticed by Geert Uytterhoeven)

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Michael Schmitz <schmitz@debian.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Apr 26, 2008
1 parent 54c0539 commit cb5528a
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions drivers/ide/legacy/falconide.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <asm/atariints.h>
#include <asm/atari_stdma.h>

#define DRV_NAME "falconide"

/*
* Base of the IDE interface
Expand Down Expand Up @@ -74,6 +75,11 @@ static int __init falconide_init(void)

printk(KERN_INFO "ide: Falcon IDE controller\n");

if (!request_mem_region(ATA_HD_BASE, 0x40, DRV_NAME)) {
printk(KERN_ERR "%s: resources busy\n", DRV_NAME);
return -EBUSY;
}

falconide_setup_ports(&hw);

hwif = ide_find_port();
Expand All @@ -83,6 +89,7 @@ static int __init falconide_init(void)

ide_init_port_data(hwif, index);
ide_init_port_hw(hwif, &hw);
hwif->mmio = 1;

ide_get_lock(NULL, NULL);
ide_device_add(idx, NULL);
Expand Down

0 comments on commit cb5528a

Please sign in to comment.